Commit Graph

26370 Commits

Author SHA1 Message Date
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 ffcceb687f fuck2 2020-08-24 03:23:45 +01:00
timothyteakettle 237a3fc682 fuck 2020-08-24 03:22:42 +01: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
lolman360 bd5848a0e3 Update recipes_misc.dm 2020-08-24 08:52:42 +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 4d7d068407 Update airlock.dm (#13182) 2020-08-23 21:01:26 +02: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 0f9f1e240c w 2020-08-24 00:51:13 +10:00
lolman360 4b2b4afc64 e 2020-08-24 00:49:31 +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 b74c5ba22d ee 2020-08-24 00:27:22 +10:00
lolman360 cdc7490ee1 e 2020-08-24 00:26:26 +10:00
lolman360 460c92de74 3 2020-08-24 00:20:04 +10:00
lolman360 1f576dfd12 Update smithed_items.dm 2020-08-24 00:15:27 +10:00
lolman360 d45ac6323a Update smithed_items.dm 2020-08-24 00:09:58 +10:00
Letter N 2ddddbbbaa input moment 2020-08-23 22:07:26 +08:00
lolman360 289280f0ec Update recipes_misc.dm 2020-08-24 00:00:39 +10:00
lolman360 05250939c6 e 2020-08-23 23:58:04 +10:00
lolman360 ccf8aaf412 ee 2020-08-23 23:53:38 +10:00
silicons e1e0d5e1da Update firedoor.dm 2020-08-23 06:50:47 -07:00
silicons b2a38a09a1 circuit 2020-08-23 05:59:24 -07:00
silicons b995581a11 changes 2020-08-23 05:33:19 -07:00
silicons bd5766a8be changes 2020-08-23 05:27:53 -07:00
lolman360 ce2dca5932 Update anvil.dm 2020-08-23 22:19:25 +10:00
silicons 2fa023346a Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
2020-08-23 05:08:50 -07:00
silicons 7f942abef2 Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
2020-08-23 05:08:14 -07:00
Putnam3145 ecbf8a5dc2 Merge pull request #13245 from Arturlang/fortitude_norun
Fortitude walking fix
2020-08-23 04:33:51 -07:00
Artur b47b14cdaa Shoot me please 2020-08-23 14:26:07 +03:00
Letter N b8d812fb47 "what if adminbus stops leaking confidential adminchat" and also updates admin things. you can now do obj/structure/singulo:50 2020-08-23 17:18:32 +08:00
lolman360 e138536cb6 eee eee eee 2020-08-23 18:29:01 +10:00