Commit Graph

16803 Commits

Author SHA1 Message Date
Linzolle
ce04739ccb neck slice 2019-12-01 15:53:40 -06:00
Linzolle
efbc85cb40 couple fxies 2019-12-01 15:39:55 -06:00
Linzolle
a20b975d68 copy paste errors lol 2019-12-01 14:40:25 -06:00
Linzolle
19b004edab update butchering 2019-12-01 14:35:11 -06:00
Putnam3145
219529d375 Merge pull request #9980 from Ghommie/Ghommie-cit406
Ports "Removes phantom gas effects on space tiles"
2019-11-30 22:53:07 -08:00
Putnam3145
1d91e1acf4 Merge pull request #10016 from deathride58/mousedropfixes
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
2019-11-30 22:51:42 -08:00
Lin
0f721cbfca Merge pull request #10017 from Putnam3145/volume-filter
Makes filters volume-based
2019-12-01 06:47:16 +00:00
Putnam3145
e1a9c8e6d3 Merge pull request #9972 from Ghommie/Ghommie-cit403
Fixed double whitespace gap in human, ai and carbon examine.
2019-11-30 22:46:29 -08:00
Putnam3145
aaf9f12e11 Merge pull request #9981 from Ghommie/Ghommie-cit407
Rags are no longer transparent reagent containers. Also allows squeezing their reagents into another container.
2019-11-30 22:44:06 -08:00
Putnam3145
a196e3f45b Merge pull request #9977 from Useroth/new-tg-plants
[FIX] Another patch for the recently added tg plants.
2019-11-30 22:23:41 -08:00
Putnam3145
44c621e5e9 Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
2019-11-30 22:22:52 -08:00
kevinz000
c3dc0e7c71 Merge pull request #9893 from Putnam3145/threat-log-fixes
[DYNAMIC] Roundend threat log only shows changes that fully happened
2019-11-30 22:48:50 -07:00
Putnam
1b310d41bf Filters are now volume-based. 2019-11-29 21:23:08 -08:00
deathride58
6b3f992d8e fixes paperbins and papercutters proper 2019-11-29 23:11:27 -05:00
deathride58
b1fca2b74b Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it 2019-11-29 22:59:37 -05:00
Putnam
00f7305aa5 holy shit 2019-11-29 17:15:49 -08:00
Putnam3145
ad53b10faa Merge pull request #9964 from GrayRachnid/fixmyblunder
Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args
2019-11-29 06:20:18 -08:00
Putnam3145
4f018b070f Merge pull request #9996 from Ghommie/Ghommie-cit413
Fixes tinfoil hats giving random traumas.
2019-11-29 06:16:36 -08:00
Putnam3145
3b437417b9 Merge pull request #10000 from Citadel-Station-13/kevinz000-patch-119
Nerfs nanite adrenals
2019-11-29 05:42:49 -08:00
Ghommie
5aed21a6f0 It's just list tabbing, gray. 2019-11-29 07:43:31 +01:00
kevinz000
f0f2063884 Merge pull request #9958 from Ghommie/Ghommie-cit396
Ports a few telecomms updates and fixes.
2019-11-28 23:12:19 -07:00
kevinz000
521fdec59b Merge pull request #9960 from Ghommie/Ghommie-cit398
Ports custom reagent icecreams.
2019-11-28 23:11:57 -07:00
kevinz000
ace239fe8f Merge pull request #9962 from Ghommie/Ghommie-cit399
Fixes limbs' set_disabled.
2019-11-28 23:11:36 -07:00
kevinz000
40179da15e Merge pull request #9965 from GrayRachnid/addfuntothekitchen
Adds Fun to the Kitchen's stacking skills
2019-11-28 23:11:24 -07:00
kevinz000
bd43a08347 Merge pull request #9967 from Ghommie/Ghommie-cit401
Ports "Plasmamen get plasma in their box"
2019-11-28 23:11:05 -07:00
kevinz000
4183d00da2 Merge pull request #9966 from Ghommie/Ghommie-cit400
Ports elements: Lightweight shared/global components.
2019-11-28 23:08:32 -07:00
kevinz000
f287af694b Merge pull request #9969 from Linzolle/hat-man-bad
revert knocking people's hats off
2019-11-28 23:04:34 -07:00
kevinz000
7495ce602a Merge pull request #9693 from Ghommie/Ghommie-cit310
Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
2019-11-28 23:03:07 -07:00
kevinz000
2c19c55fc3 Update nanite_programs.dm 2019-11-28 23:00:09 -07:00
Ghommie
7990d1328b Fixes tinfoil hats giving random traumas. 2019-11-29 06:48:52 +01:00
Ghommie
2bd4ac5de8 Also AI and Carbon 2019-11-29 06:31:23 +01:00
Ghommie
c8d3856d73 Sanity 2019-11-28 20:34:41 +01:00
Ghommie
f2d6e6b78f Allows people to squeeze it into another container. 2019-11-28 20:31:30 +01:00
Lin
a5b5fb729a Merge pull request #9959 from Ghommie/Ghommie-cit397
patching some combat mode edge cases and issues.
2019-11-28 19:16:44 +00:00
Lin
46c02af86e Merge pull request #9948 from Ghommie/Ghommie-cit393
Morgues no longer go "ammunition depleted"
2019-11-28 19:12:25 +00:00
Ghommie
9bef7edd0f Rags are no longer transparent reagent containers. 2019-11-28 19:59:34 +01:00
Ghommie
74baa00634 Ports "#44787" 2019-11-28 19:37:46 +01:00
Putnam3145
09897b4ece Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her
Ports AI console focus loss fix and fixes an error in my trimline code
2019-11-28 05:37:36 -08:00
Useroth
85a6d588a8 [fix] Extradimensional oranges now actually grow properly and give proper seeds. 2019-11-28 09:26:52 +01:00
GrayRachnid
b6df1126bb Can't I make a PR without having to make 2 commits to fix my mistakes oh my god 2019-11-27 22:52:21 -05:00
Ghommie
b66832809e Fixing that tiny gap in human examine. 2019-11-28 04:37:16 +01:00
Linzolle
829cc3d81c Revert "Merge pull request #9613 from Linzolle/hat-toss"
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
2019-11-27 20:23:33 -06:00
Ghommie
1795072f94 Mistakes were made. 2019-11-28 02:47:09 +01:00
Ghommie
efcf79aab0 teachin' 🅱️ how to swim 2019-11-28 02:32:43 +01:00
Ghommie
13b9158a44 Ports "Plasmamen get plasma in their box" 2019-11-28 02:30:03 +01:00
Ghommie
dd9116ee70 Ports elements: Lightweight shared/global components. 2019-11-28 01:47:20 +01:00
GrayRachnid
ad6684380c You can now stack stuff pretty high 2019-11-27 18:39:11 -05:00
GrayRachnid
6a13801c1a I assume this is what ghommie meant 2019-11-27 18:34:36 -05:00
GrayRachnid
47e3cd346f Fixes codewords and MKUltra enthrall hearing. 2019-11-27 16:36:19 -05:00
Ghommie
a5298dac7e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 2019-11-27 21:44:56 +01:00