Commit Graph

17612 Commits

Author SHA1 Message Date
lolman360 519592693b e 2020-08-25 19:01:07 +10:00
lolman360 c79f63bd00 e 2020-08-25 18:54:22 +10:00
raspy-on-osu 46bec76f41 tesla can now be contained
for whatever reason, the contained variable was unused for teslas, but now it is
unintentional side-effect may be that grounding rods for tesla containments with a larger than 1x1 tile space might get eaten (untested but assumed)
2020-08-25 00:46:04 -04:00
raspy-on-osu 1a5248359c if(rods) literally just eats disk space and nothing more
no longer. 300 bytes saved
2020-08-24 23:46:38 -04:00
raspy-on-osu 2e5517b9f3 if committing above suggestion, remove these two lines
ok done
2020-08-24 23:36:37 -04:00
raspy-on-osu 1fdb233ede Update code/modules/power/tesla/energy_ball.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-08-24 23:35:17 -04:00
raspy-on-osu 77015ed166 Update code/modules/power/tesla/energy_ball.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-08-24 23:33:27 -04:00
raspy-on-osu df30569104 Update code/modules/power/tesla/energy_ball.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-08-24 23:32:48 -04:00
raspy-on-osu 591fc16747 oops! no grounding rods
now it (hopefully) won't delete rods from within containment
2020-08-24 23:20:28 -04:00
raspy-on-osu 9743e5b458 tesla counterplay??
just put out some grounding rods and it'll eat up the rods at expense of some energy
2020-08-24 23:10:44 -04:00
raspy-on-osu 2439a0654b it likes moving grounding rod
now it actually gets the dir instead of just adding the rod itself to the pick

also moved declaration of move_dir because dm was freaking out because i had two declarations
2020-08-24 20:54:36 -04:00
raspy-on-osu 580afaf74a init
first attempt
2020-08-24 20:29:25 -04:00
Timothy Teakettle be22486913 this hurt to do manually 2020-08-24 19:55:10 +01:00
lolman360 0ff85deddf Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-25 01:25:34 +10:00
lolman360 b5c000cac4 eee 2020-08-24 23:48:45 +10:00
lolman360 4e82ce87eb EEEEEEEEEEEEe 2020-08-24 23:43:42 +10:00
lolman360 a2f33d27a2 ee 2020-08-24 23:42:39 +10:00
lolman360 dcbdc05c5a Update smithed_items.dm 2020-08-24 23:31:21 +10:00
lolman360 30471d4171 Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants 2020-08-24 21:08:00 +10:00
lolman360 e646b3af32 bet 2020-08-24 21:03:11 +10:00
Letter N c13a22a841 stops kevinz from leaking his IP 2020-08-24 18:42:48 +08:00
lolman360 9d9a6d0d5d Update anvil.dm 2020-08-24 20:33:21 +10:00
lolman360 e8379eb6a2 whoops 2020-08-24 19:11:01 +10:00
lolman360 2df3bbd822 r 2020-08-24 18:55:48 +10:00
lolman360 94e24a9738 anvillan 2020-08-24 17:52:42 +10:00
EmeraldSundisk e0b70da487 Update paper_premade.dm 2020-08-23 20:53:52 -07:00
lolman360 ff5c4d779f ok 2020-08-24 13:19:05 +10:00
lolman360 579d7bb4f2 whoops! 2020-08-24 12:49:54 +10:00
lolman360 037b939f55 THIS WAS THE PROBLEM THE ENTIRE TIME 2020-08-24 12:36:17 +10:00
timothyteakettle cd7293a9a2 limbs 2020-08-24 03:19:36 +01:00
lolman360 97e5fbd29f YOU CAN UNPACK IT NOW FOLKS, KATANAS NO LONGER DROPDEL 2020-08-24 11:48:22 +10:00
lolman360 d9f1ebd6f5 MOVING SOME LINES AROUND FOLKS 2020-08-24 11:44:18 +10:00
lolman360 40bcd3f902 PACK IT UP FOLKS 2020-08-24 11:18:02 +10:00
silicons 40b489006d Merge pull request #13225 from raspy-on-osu/teg-castration
Heavily nerfs the TEG.
2020-08-23 17:52:44 -07:00
silicons 64968bd655 Merge pull request #13242 from Literallynotpickles/coat-sensors
lets you equip handheld crew monitors on all med winter coats
2020-08-23 17:41:10 -07:00
silicons f0bcab1143 Merge pull request #13241 from Putnam3145/voreeject
Made all death release vore contents, not just gibbing/dusting
2020-08-23 17:39:43 -07:00
silicons f86daefa4e Merge pull request #13240 from timothyteakettle/ipcs-spark-when-blush
ipcs make fake electrical sparks when they blush or cry
2020-08-23 17:36:23 -07:00
silicons 82d8b7266f Merge pull request #13238 from Hatterhat/insidious-tackle
insidious combat gloves but they can tackle now
2020-08-23 17:36:03 -07:00
lolman360 f2a7c2599d Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-24 09:36:36 +10:00
Timothy Teakettle e2aeaf8a5b dont need this anymore 2020-08-23 21:55:21 +01:00
Timothy Teakettle a7a6489f58 loadout loading 2020-08-23 21:48:38 +01:00
silicons a8ee36fe85 fixes wormhole jaunters and makes them no longer collide with bohs/other bluespace teleportation disruptors (#13209)
* Update wormhole_jaunter.dm

* Update wormhole_jaunter.dm
2020-08-23 21:00:07 +02:00
silicons 1abe2458ee Update taeclowndo.dm (#13227) 2020-08-23 20:58:34 +02:00
lolman360 5218840e6d w 2020-08-24 02:01:46 +10:00
lolman360 daeaf81ab6 e 2020-08-24 01:25:26 +10:00
lolman360 69caf7a331 ear 2020-08-24 00:56:38 +10:00
lolman360 eda8d516b9 e 2020-08-24 00:41:22 +10:00
lolman360 a032fb4a3d e 2020-08-24 00:35:12 +10:00
lolman360 6463d0b785 Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants 2020-08-24 00:27:29 +10:00
lolman360 cdc7490ee1 e 2020-08-24 00:26:26 +10:00