Commit Graph
16760 Commits
Author SHA1 Message Date
YakumoChenandGitHub a6ff44782a adds more unique ai holograms 2019-11-23 03:51:04 +00:00
Putnam3145andGitHub 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
Putnam3145andGitHub 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
FermiandFermi 37ac0ccb66 Okay 2019-11-23 00:23:43 +00:00
FermiandFermi b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks 2019-11-23 00:10:33 +00: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
Putnam3145andGitHub 6145cd0d96 Merge pull request #9886 from Ghommie/Ghommie-cit384
chem dispenser beakers and bikehorn fixes.
2019-11-22 15:48:28 -08:00
FermiandFermi b056d91ea5 Removes the random love 2019-11-22 23:48:21 +00:00
Putnam3145andGitHub b7f7342e43 Merge pull request #9900 from Ghommie/Ghommie-cit388
fixing a get_idcard runtime. or The betrayal of the ?. operator
2019-11-22 15:41:52 -08:00
GrayRachnid a7918717ff fixes compile errors. 2019-11-22 18:22:53 -05:00
GrayRachnid 61299fee42 ready for review/testing 2019-11-22 15:32:09 -05:00
GrayRachnid 3544885b73 reverts fermis changes, woops. 2019-11-22 15:26:20 -05:00
GrayRachnid c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Ghommie 7d3599b2f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 2019-11-22 18:53:58 +01:00
Ghommie 66a97cb224 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 2019-11-22 05:17:42 +01:00
kiwedesparsandGitHub 98998ca85f un-moths the anthromorphic insects 2019-11-21 19:47:48 -08:00
LinandGitHub 522a664f55 Merge pull request #9887 from Ghommie/Ghommie-cit385
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-22 02:39:29 +00:00
LinandGitHub 1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
LinandGitHub 3979079fde Merge pull request #9518 from Ghommie/Ghommie-cit243
Ports "You can now click on objects and mobs below flaps and signs"
2019-11-22 01:36:47 +00:00
Putnam 72a119da2e Prevents VR mobs from being midround antags. 2019-11-21 17:31:22 -08:00
LinandGitHub c2d182d50d Merge pull request #9823 from Seris02/wintergalorefix
Adds HoS, HoP, CE, CMO, QM, RD, chemistry, genetics, virology, robotics, janitor and cosmic winter coats - Try 2
2019-11-22 01:16:35 +00:00
LinandGitHub 2412bad483 Merge pull request #9889 from GrayRachnid/fixgoldbox
Fixes gold toolbox inhand sprite having the wrong name
2019-11-22 01:14:39 +00:00
Unknown 4974400ccb Merge branch 'master' into xantholne-berets01 2019-11-21 11:01:42 -07:00
Useroth 29ae9eb962 Added reagent IDs. 2019-11-21 12:52:49 +01:00
Useroth 2ced7db508 Ported a bunch of tg hydroponic stuff. 2019-11-21 10:53:57 +01:00
Ghommie bfeece4c6e fixing a get_idcard runtime. The betrayal of the ?. 2019-11-21 09:23:05 +01:00
a95b78af52 Update code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-21 00:52:52 -06:00
Ghommie 6a0bd7c925 THE REVENGE OF THE WHITESPACES 2019-11-21 07:40:49 +01:00
Ghommie 5153ed04ec aaa 2019-11-21 06:48:26 +01:00
Ghommie 911a33bfd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387 2019-11-21 06:36:59 +01:00
Ghommie dccb3c2e22 part 3 2019-11-21 06:36:22 +01:00
Unknown 71b3b8fdc6 Ports/Adds new Berets
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07:00
kevinz000andGitHub c22ae596fc Merge pull request #9880 from Putnam3145/meteor-random-fix
Makes sure every dynamic-triggered event isn't random on dynamic
2019-11-20 22:12:42 -07:00
kevinz000andGitHub 1efd3ae395 Merge pull request #9866 from Useroth/tatorstrangeseeds
Adds strange seeds as a buyable traitor botanist item.
2019-11-20 22:09:53 -07:00
kevinz000andGitHub 61c759f7a2 Merge pull request #9865 from Useroth/bagsort
Glitchfix. Prevents storage bags from changing the order of their numbered contents when items are removed.
2019-11-20 22:09:22 -07:00
kevinz000andGitHub 30aefd050a Merge pull request #9868 from Ghommie/Ghommie-cit376
Fixes superlube waterflower.
2019-11-20 22:08:54 -07:00
Seris02 60def2a9fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-21 13:08:23 +08:00
nik707andGitHub 8d363b8e9d Merge pull request #9323 from Citadel-Station-13/kevinz000-patch-85
adds poll ignore for magical antagonists
2019-11-20 23:03:39 -06:00
kevinz000andGitHub 42de0d5ebe Merge pull request #9831 from Putnam3145/dynamic-nukeops-pop-fix
Makes dynamic nukeops population scaling more like secret
2019-11-20 22:01:49 -07:00
nik707andGitHub 0300927974 Merge pull request #9487 from Citadel-Station-13/spooky
adds an easy way for admins to force enable halloween races without the rest of halloween's code
2019-11-20 23:00:09 -06:00
nik707andGitHub 56d2c0edad Merge pull request #9681 from Citadel-Station-13/kevinz000-patch-107
buffs bluespace apprentice (targeted teleport --> blink)
2019-11-20 22:55:21 -06:00
kevinz000andGitHub 540a57b518 Merge pull request #9828 from Putnam3145/dynamic-meteor-nonrepeat
Makes meteor not repeatable in dynamic.
2019-11-20 21:53:05 -07:00
nik707andGitHub 28190bc168 Merge pull request #9703 from Citadel-Station-13/kevinz000-patch-109
emagged medibots now murder the everloving fuck out of slimepeople
2019-11-20 22:52:11 -06:00
nik707andGitHub df11e75414 Merge pull request #9718 from Citadel-Station-13/kevinz000-patch-110
fixes a bug with rnd multiprinting
2019-11-20 22:51:32 -06:00
nik707andGitHub 6d889e66c4 Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111
Is it the time of year to buff disablers again?
2019-11-20 22:51:11 -06:00
kevinz000andGitHub 8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00