Commit Graph

3278 Commits

Author SHA1 Message Date
Ghommie 77ef3dabea Demodularize moodlets. 2019-12-04 23:10:39 +01:00
Arturlang 138847838a I suppose 2019-12-04 21:17:49 +02:00
Trilbyspaceclone 2a591df09a Update wallets.dm 2019-12-04 12:50:18 -05:00
Arturlang 7d3103a260 Done 2019-12-04 15:02:36 +02:00
kevinz000 d578bbd10a Merge pull request #10021 from Putnam3145/rld-fix
Makes glowsticks no longer radioactively contaminable.
2019-12-03 19:53:18 -07:00
Trilbyspaceclone aa3598f166 less dope 2019-12-03 19:51:19 -05:00
Trilbyspaceclone 0b90def435 Update sheet_types.dm 2019-12-03 19:43:31 -05:00
Ghommie 3fb485c721 Fixes the incongruent bone satchel description. 2019-12-03 22:39:07 +01:00
Ghommie 3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31:35 +01:00
Lin 99e9c7299e Merge pull request #10004 from Ghommie/Ghommie-cit414
Unmodularizing first aid kits.
2019-12-03 01:30:51 +00:00
Putnam3145 8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Putnam3145 c5c52caf2e Merge pull request #10010 from Ghommie/Ghommie-cit415
Fixes implant pads and updates them a little (WHY THE HELL DO WE STILL HAVE THIS OLDCODE CRAP LINGERING AROUND?)
2019-12-01 13:43:21 -08:00
Linzolle 19b004edab update butchering 2019-12-01 14:35:11 -06:00
Artur f48d8016d5 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-01 13:51:57 +02:00
Putnam 010bee19f4 damn you feasel 2019-12-01 00:22:15 -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
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
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
loginsandylogout c0e77f8fdf Update code/game/objects/items/stacks/medical.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-29 15:10:30 -06:00
Commandersand 36b0ef53a0 bruh 2019-11-29 14:49:29 -06:00
Commandersand 4c4935f155 yeet 2019-11-29 14:13:39 -06:00
Artur 02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
Ghommie d9636398e1 Fixes implant pads 2019-11-29 20:12:10 +01:00
Ghommie f5b4d6a0ad Oh bummers. 2019-11-29 07:27:05 +01:00
Ghommie 9b8ed8ca4f The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs. 2019-11-29 07:14:51 +01:00
Ghommie e6484a22a8 Ports tgstation loom changes, and durathred golems. 2019-11-29 05:34:17 +01:00
Ghommie 3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie 0ad89bd9de Merging, tweaking or otherwise removing a few of the stupidest cargo packs. 2019-11-28 05:34:56 +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 af0110db40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-11-27 21:16:20 +01:00
Ghommie f9680130f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-27 18:48:20 +01:00
Fermi e6ecabe54c Scanner 2019-11-26 23:23:29 +00:00
Fermi ca2467ff93 Thingie 2019-11-26 23:14:14 +00:00
kevinz000 ccfdb74508 Merge pull request #9882 from FestiveBall/Fersi
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2019-11-26 16:02:42 -07:00
Fermi c5e6cb8ac0 space 2019-11-26 04:08:10 +00:00
Fermi 69e0f6836a Adds a lil message so people don't spend 25 minutes trying everything 2019-11-26 04:05:43 +00:00
Linzolle cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-25 21:01:25 -06:00
Winter Flare 6a4c959b0a Added more crates. 2019-11-24 19:05:03 -05:00
BlackMajor 786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
BlackMajor c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
BlackMajor 6f98efb18e Merge pull request #9902 from Useroth/new-tg-plants
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
kevinz000 75510d8da9 Merge pull request #9749 from Trilbyspaceclone/patch-238
What do you mean I cant hold the armory on my back? -BOH nerf
2019-11-23 11:42:37 -07:00
Putnam3145 037b278e9e Merge pull request #9918 from Ghommie/Ghommie-cit384
[S] Makes it compile.
2019-11-22 18:14:41 -08:00
Ghommie 77800cf720 Oh yea it's a list 2019-11-23 03:02:29 +01:00
Ghommie 2d1edf661b Fixes travis. 2019-11-23 02:58:03 +01:00
Putnam3145 ea4fdf727b Merge pull request #9917 from Ghommie/Ghommie-cit384
[S] bikehorn fix 2: sound() doesn't accept double quotes i think, my bad.
2019-11-22 17:06:50 -08:00
Ghommie 82d97ff4a7 This way is better 2019-11-23 01:51:31 +01:00
Ghommie 24c93d9df6 [S] bikehorn fix 2: sound() datum doesn't accept double quotes, my bad. 2019-11-23 01:46:59 +01:00
GrayRachnid 77913406ed Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 18:50:24 -05:00