Skip to content

Commit

Permalink
Merge pull request #886 from CeladonSS13/revert-880-cringe19
Browse files Browse the repository at this point in the history 
Revert "Battery problem"
  • Loading branch information
@MysticalFaceLesS
MysticalFaceLesS authored Aug 9, 2024
2 parents 9c9dcc5 + eea01a7 commit a009fd6
Show file tree
Hide file tree
Showing 25 changed files with 63 additions and 363 deletions.
8 changes: 4 additions & 4 deletions _maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
/obj/item/spacecash/bundle/c1000,
/obj/item/spacecash/bundle/c1000,
/obj/item/spacecash/bundle/c1000,
/obj/item/stock_parts/cell/gun/medium/upgraded,
/obj/item/stock_parts/cell/gun/upgraded,
/obj/structure/safe,
/turf/open/floor/carpet/blue,
/area/ruin/lavaland/factory/manager_office)
Expand Down Expand Up @@ -580,7 +580,7 @@
/obj/effect/turf_decal/ntlogo{
dir = 4
},
/obj/item/stock_parts/cell/gun/medium/empty,
/obj/item/stock_parts/cell/gun/empty,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/lobby)
"fs" = (
Expand Down Expand Up @@ -2044,8 +2044,8 @@
dir = 9
},
/obj/structure/closet/secure_closet/security,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/head/helmet/sec,
/obj/item/clothing/glasses/hud/security/sunglasses,
Expand Down
10 changes: 5 additions & 5 deletions _maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_lab.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
/area/ruin/powered)
"fJ" = (
/obj/structure/rack,
/obj/item/stock_parts/cell/gun/medium/empty,
/obj/item/stock_parts/cell/gun/empty,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/structure/sign/poster/official/random{
pixel_y = 32
Expand Down Expand Up @@ -192,7 +192,7 @@
pixel_y = 32
},
/obj/structure/rack,
/obj/item/stock_parts/cell/gun/medium/empty,
/obj/item/stock_parts/cell/gun/empty,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -317,7 +317,7 @@
/area/ruin/powered)
"pf" = (
/obj/structure/rack,
/obj/item/stock_parts/cell/gun/medium/empty,
/obj/item/stock_parts/cell/gun/empty,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/rust,
/area/ruin/powered)
Expand Down Expand Up @@ -382,7 +382,7 @@
/area/ruin/powered)
"sv" = (
/obj/structure/rack,
/obj/item/stock_parts/cell/gun/medium/empty,
/obj/item/stock_parts/cell/gun/empty,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -524,7 +524,7 @@
/area/ruin/powered)
"xz" = (
/obj/structure/rack,
/obj/item/stock_parts/cell/gun/medium/upgraded/empty,
/obj/item/stock_parts/cell/gun/upgraded/empty,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/rust,
/area/ruin/powered)
Expand Down
6 changes: 3 additions & 3 deletions _maps/_mod_celadon/shuttles/independent/independent_mudskipper.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@
locked = 1
},
/obj/item/gun/energy/laser/scatter,
/obj/item/stock_parts/cell/gun/medium/upgraded,
/obj/item/stock_parts/cell/gun/upgraded,
/obj/machinery/holopad/emergency/command,
/obj/item/storage/backpack/duffelbag,
/obj/item/clothing/glasses/sunglasses,
Expand All @@ -634,8 +634,8 @@
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/e10,
/obj/item/gun/energy/laser/e10,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"ot" = (
Expand Down
14 changes: 7 additions & 7 deletions _maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,7 @@
/obj/item/clothing/suit/poncho,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/gun/energy/e_gun/adv_stopping,
/obj/item/stock_parts/cell/gun/medium/upgraded,
/obj/item/stock_parts/cell/gun/upgraded,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"nB" = (
Expand Down Expand Up @@ -1737,12 +1737,12 @@
/obj/structure/rack,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/effect/turf_decal/corner/opaque/bar/full,
/obj/item/stock_parts/cell/gun/medium/empty,
/obj/item/stock_parts/cell/gun/medium/empty{
/obj/item/stock_parts/cell/gun/empty,
/obj/item/stock_parts/cell/gun/empty{
pixel_x = -8;
pixel_y = -2
},
/obj/item/stock_parts/cell/gun/medium/empty{
/obj/item/stock_parts/cell/gun/empty{
pixel_y = 3;
pixel_x = 9
},
Expand Down Expand Up @@ -3520,12 +3520,12 @@
"SE" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/opaque/bar/full,
/obj/item/stock_parts/cell/gun/medium/empty,
/obj/item/stock_parts/cell/gun/medium/empty{
/obj/item/stock_parts/cell/gun/empty,
/obj/item/stock_parts/cell/gun/empty{
pixel_y = -3;
pixel_x = -7
},
/obj/item/stock_parts/cell/gun/medium/empty{
/obj/item/stock_parts/cell/gun/empty{
pixel_y = 3;
pixel_x = 11
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1316,9 +1316,9 @@
},
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/structure/rack,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
Expand Down
20 changes: 10 additions & 10 deletions _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1538,60 +1538,60 @@
pixel_x = -7;
dir = 1
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
pixel_x = -4;
maxcharge = 20000;
pixel_y = -4;
name = "special weapon power cell"
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
pixel_x = 4;
maxcharge = 20000;
pixel_y = -4;
name = "special weapon power cell"
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
pixel_x = 10;
maxcharge = 20000;
pixel_y = 5;
name = "special weapon power cell"
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
maxcharge = 20000;
pixel_y = 5;
name = "special weapon power cell"
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
maxcharge = 20000;
pixel_y = 5;
name = "special weapon power cell";
pixel_x = -8
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
maxcharge = 20000;
pixel_y = -5;
name = "special weapon power cell";
pixel_x = -8
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
maxcharge = 20000;
pixel_y = -5;
name = "special weapon power cell";
pixel_x = 11
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
maxcharge = 20000;
pixel_y = 7;
name = "special weapon power cell";
pixel_x = 11
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
maxcharge = 20000;
pixel_y = 7;
name = "special weapon power cell";
pixel_x = -6
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
maxcharge = 20000;
pixel_y = 7;
name = "special weapon power cell";
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/head/nanotrasen/captain/peaked,
/obj/item/clothing/head/nanotrasen/captain,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun,
/obj/item/gun/energy/laser,
/obj/item/megaphone/command,
/obj/machinery/light/small/directional/east,
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
anchored = 1
},
/obj/item/clothing/head/caphat/nt,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun,
/obj/item/gun/energy/laser,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/head/caphat/parade,
Expand Down
8 changes: 4 additions & 4 deletions _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6594,7 +6594,7 @@
/obj/item/clothing/under/rank/centcom/centcom_skirt,
/obj/item/clothing/suit/hooded/wintercoat/centcom,
/obj/item/clothing/head/beret/centcom_formal,
/obj/item/stock_parts/cell/gun/medium/upgraded,
/obj/item/stock_parts/cell/gun/upgraded,
/obj/item/clothing/head/centcom_cap,
/obj/item/clothing/gloves/combat,
/turf/open/floor/carpet/green,
Expand Down Expand Up @@ -13105,15 +13105,15 @@
pixel_y = 17;
pixel_x = 4
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
pixel_x = -3;
pixel_y = -5
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
pixel_x = 1;
pixel_y = -5
},
/obj/item/stock_parts/cell/gun/medium{
/obj/item/stock_parts/cell/gun{
pixel_x = 5;
pixel_y = -5
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_osprey.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/obj/item/clothing/suit/armor/vest,
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/deputy,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun/mini,
/obj/item/stock_parts/cell/gun/mini,
/obj/item/ammo_box/magazine/co9mm,
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3120,7 +3120,7 @@
/obj/item/gun/energy/e_gun{
pixel_y = 1
},
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun,
/obj/item/melee/classic_baton/telescopic,
/obj/item/kitchen/knife/combat/survival,
/obj/item/gps,
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_skipper.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5596,7 +5596,7 @@
/obj/item/melee/baton/loaded,
/obj/item/restraints/handcuffs,
/obj/item/restraints/handcuffs,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun/mini,
/obj/item/stock_parts/cell/gun/mini,
/obj/item/ammo_box/magazine/co9mm,
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
dir = 8;
pixel_x = -32
},
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun,
/obj/item/kitchen/knife/combat/survival,
/obj/item/clothing/suit/jacket/miljacket,
/obj/item/storage/backpack/messenger/com,
Expand Down
12 changes: 6 additions & 6 deletions _maps/_mod_celadon/shuttles/pirate/pirate_crying_sun.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4016,27 +4016,27 @@
/area/ship/crew/office)
"GW" = (
/obj/structure/rack,
/obj/item/stock_parts/cell/gun/medium/pgf{
/obj/item/stock_parts/cell/gun/pgf{
pixel_y = 12;
pixel_x = -3
},
/obj/item/stock_parts/cell/gun/medium/pgf{
/obj/item/stock_parts/cell/gun/pgf{
pixel_y = 10;
pixel_x = 2
},
/obj/item/stock_parts/cell/gun/medium/pgf{
/obj/item/stock_parts/cell/gun/pgf{
pixel_y = 8;
pixel_x = 8
},
/obj/item/stock_parts/cell/gun/medium/pgf{
/obj/item/stock_parts/cell/gun/pgf{
pixel_y = 6;
pixel_x = -9
},
/obj/item/stock_parts/cell/gun/medium/pgf{
/obj/item/stock_parts/cell/gun/pgf{
pixel_y = 4;
pixel_x = -3
},
/obj/item/stock_parts/cell/gun/medium/pgf{
/obj/item/stock_parts/cell/gun/pgf{
pixel_y = 2;
pixel_x = 3
},
Expand Down
16 changes: 8 additions & 8 deletions _maps/_mod_celadon/shuttles/pirate/pirate_noderider.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1026,14 +1026,14 @@
name = "weapons locker"
},
/obj/item/gun/energy/e_gun/smg,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/gun/energy/laser/iot,
/obj/item/gun/energy/laser/iot,
/obj/item/gun/energy/e_gun/smg,
Expand Down
4 changes: 2 additions & 2 deletions _maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1912,8 +1912,8 @@
/obj/item/ammo_box/magazine/m12g,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/turf_decal/industrial/traffic/full,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun/medium,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/ammo_box/magazine/m556,
/obj/item/ammo_box/magazine/m556,
/obj/item/ammo_box/magazine/m556,
Expand Down
5 changes: 0 additions & 5 deletions code/modules/projectiles/guns/energy.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,6 @@
if(mag_size == MAG_SIZE_LARGE && !istype(C, /obj/item/stock_parts/cell/gun/large))
to_chat(user, span_warning("\The [C] doesn't seem to fit into \the [src]..."))
return FALSE
// [CELADON-ADD] - CELADON_BALANCE - Добавляем проверку на магазин
if(mag_size == MAG_SIZE_MEDIUM && !istype(C, /obj/item/stock_parts/cell/gun/medium))
to_chat(user, span_warning("\The [C] doesn't seem to fit into \the [src]..."))
return FALSE
// [/CELADON-ADD] - CELADON_BALANCE
if(user.transferItemToLoc(C, src))
cell = C
to_chat(user, span_notice("You load the [C] into \the [src]."))
Expand Down
1 change: 0 additions & 1 deletion mod_celadon/balance/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ EDIT: `code\modules\mob\living\simple_animal\hostile\mining_mobs\elites\elite.dm

ADD: `code\modules\projectiles\ammunition\_ammunition.dm` : /obj/item/ammo_casing/attackby(obj/item/I, mob/user, params) -> добавлены звук подбора патрона в магазин с пола и задержка в 1 секунду зависящая от кликанья по патронам. Чем быстрее клики - тем быстрее загрузятся патроны.
Очки с зомби и ксеноморфов
`code/modules/projectiles/guns/energy.dm` : `/obj/item/gun/energy/proc/insert_cell(mob/user, obj/item/stock_parts/cell/gun/C)` - Добавляем проверку на магазин среднего размера
REMOVE: `D:\1ss\ShiptestYata\code\modules\surgery\experimental_dissection.dm`: `/datum/surgery_step/dissection/preop`
REMOVE: `code\modules\projectiles\guns\energy.dm`

Expand Down
Loading

0 comments on commit a009fd6

Please sign in to comment.