 BlackMajor
|
afdf8c698a
|
fuck
|
2020-07-04 19:30:20 +12:00 |
|
|
BlackMajor
|
7c21f7bd4e
|
[s] Don't give these to your kids for christmas
Someone did a fucky wucky.
|
2020-07-04 17:17:34 +12:00 |
|
|
silicons
|
824d11b085
|
death to lists
|
2020-07-03 02:34:59 -07:00 |
|
|
silicons
|
d85edbf8fb
|
ok
|
2020-07-03 02:15:06 -07:00 |
|
|
silicons
|
9ae040b904
|
Merge pull request #12657 from bunny232/witchhunterhat
Witch hunter hat tweak.
|
2020-07-02 01:48:19 -07:00 |
|
|
silicons
|
3f1119fcdb
|
Merge pull request #12630 from Ghommie/Ghommie-cit822
You can't (un)equip garments on/from obscured inventory slots anymore.
|
2020-07-02 01:44:59 -07:00 |
|
|
Lin
|
fa1e92d588
|
Merge pull request #12656 from Ghommie/Ghommie-cit826
Fixing two handed items and etcetera.
|
2020-07-01 14:30:16 -05:00 |
|
|
Ghom
|
aaffe3ec12
|
Merge pull request #12647 from zeroisthebiggay/fuckfuckfuckfuck
attempts to port Wizard Gamemode now ends when all wizards and wizard apprentices are dead #47514
|
2020-07-01 19:46:16 +02:00 |
|
|
bunny232
|
afe9b2dfbd
|
Update holy_weapons.dm
|
2020-06-30 11:15:40 -04:00 |
|
|
Ghommie
|
cd1c5511a4
|
Fixing two handed items and etcetera.
|
2020-06-30 16:24:04 +02:00 |
|
|
zerothebigboy
|
40c515b383
|
i hope this works
|
2020-06-29 19:13:26 -04:00 |
|
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
|
silicons
|
26fee48cec
|
Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
|
2020-06-29 14:18:10 -07:00 |
|
|
Putnam3145
|
ee2fedd4af
|
Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-06-29 12:44:33 -07:00 |
|
|
Ghom
|
b280c0f550
|
Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
|
2020-06-29 21:13:06 +02:00 |
|
|
Ghommie
|
0779dd560e
|
More and more fixes.
|
2020-06-29 18:52:37 +02:00 |
|
|
Timothy Teakettle
|
9d134f4fc9
|
blood fix
|
2020-06-29 16:34:55 +01:00 |
|
|
Timothy Teakettle
|
ae49152e10
|
fixes my stupid mistake
|
2020-06-28 17:05:30 +01:00 |
|
|
Ghommie
|
a34a7ba5d4
|
You can't (un)equip garments on/from obscured inventory slots anymore.
|
2020-06-28 01:10:22 +02:00 |
|
|
silicons
|
2ab69c0170
|
Merge pull request #12603 from b1tt3r1n0/Pouches(again)
Some edits to pouches, and something that can hold sheets.
|
2020-06-27 14:54:57 -07:00 |
|
|
silicons
|
45a6061958
|
Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
|
2020-06-27 14:53:28 -07:00 |
|
|
silicons
|
8b04fd70de
|
Merge pull request #12615 from Ghommie/Ghommie-cit821
Solving several issues.
|
2020-06-27 14:52:59 -07:00 |
|
|
Ghom
|
58778f2e6e
|
Merge pull request #12619 from timothyteakettle/what-if-blood-didnt-suck
slimes blood colour is their body colour
|
2020-06-27 22:14:17 +02:00 |
|
|
timothyteakettle
|
b94267e1e1
|
more spellchecks
|
2020-06-27 02:41:50 +01:00 |
|
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01:00 |
|
|
Timothy Teakettle
|
9c9868438c
|
some fixes
|
2020-06-26 22:49:43 +01:00 |
|
|
Timothy Teakettle
|
334d55bef3
|
add support for custom blood colours
|
2020-06-26 20:29:40 +01:00 |
|
|
Ghom
|
c003904600
|
Update code/game/machinery/doors/door.dm
Co-authored-by: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
|
2020-06-26 19:14:20 +02:00 |
|
|
Ghommie
|
09ce081565
|
Based chicken simple mob reveals issue with code.
|
2020-06-26 19:11:23 +02:00 |
|
|
Ghommie
|
8f6b31c26e
|
Solving several issues.
|
2020-06-26 18:40:20 +02:00 |
|
|
silicons
|
a2a1ae3a2c
|
Merge pull request #12592 from timothyteakettle/felinids-nya-when-tabled
felinids nya when tabled
|
2020-06-25 18:33:34 -07:00 |
|
|
silicons
|
54c8d58e52
|
Update clown_items.dm
|
2020-06-24 23:20:51 -07:00 |
|
|
silicons
|
cd893c60a2
|
Merge pull request #12600 from Ghommie/Ghommie-cit820
Fixing the snore-pocalypse, and another not so critical issue.
|
2020-06-24 20:27:16 -07:00 |
|
|
b1tt3r1n0
|
a780b9037c
|
Some edits to pouches, and something that can hold sheets.
Title. Vendor edits and a minor engineering addition for those who want to hold sheets and shit.
|
2020-06-24 23:07:56 -04:00 |
|
|
Ghommie
|
fe3932a36e
|
Fixing the snore-pocalypse, and another not so critical issue.
|
2020-06-24 23:08:40 +02:00 |
|
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
|
silicons
|
3cad6221ca
|
Merge pull request #12571 from Detective-Google/medigygax
Adds the medical-spec gygax
|
2020-06-24 08:43:30 -07:00 |
|
|
Timothy Teakettle
|
b83c428744
|
Update tables_racks.dm
|
2020-06-24 14:37:08 +01:00 |
|
|
Ghommie
|
ae053a9a08
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
|
2020-06-23 03:12:49 +02:00 |
|
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
|
Detective Google
|
472ed97b8c
|
port tg#51713
|
2020-06-22 15:32:23 -05:00 |
|
|
Lin
|
2cd18f3dba
|
Merge pull request #12557 from silicons/life
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
|
2020-06-21 18:32:58 -05:00 |
|
|
silicons
|
99a7c49e52
|
Merge pull request #12561 from shellspeed1/Ports-kyro-chems
Ports IV bags from TG
|
2020-06-21 14:11:10 -07:00 |
|
|
silicons
|
8cd81ff89b
|
Merge pull request #12488 from Ghommie/Ghommie-cit813
Porting Cargo small-order support, cargo goodies packs, beating vendors for loot/squish.
|
2020-06-21 14:10:45 -07:00 |
|
|
Detective Google
|
ab05e48149
|
adds the medical gygax
|
2020-06-20 16:22:28 -05:00 |
|
|
Detective Google
|
4e26916502
|
Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald
|
2020-06-20 14:00:14 -05:00 |
|
|
Ghommie
|
29a8d2ed78
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813
|
2020-06-20 00:07:47 +02:00 |
|
|
Ghom
|
e31ce2edcf
|
Merge pull request #12414 from LetterN/asset-cache-thing
asset cache + better minimaps
|
2020-06-19 23:09:09 +02:00 |
|
|
shellspeed1
|
9197cb4813
|
allows storage in medbelts and organ boxes.
|
2020-06-18 21:06:22 -07:00 |
|
|
Lin
|
3cdc73ff35
|
Merge pull request #12487 from kevinz000/erp_2
Adds ||italics|| __underline__ ++bold++ support because why the fuck not
|
2020-06-18 13:37:10 -05:00 |
|