shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,564 Commits 5 Branches 0 Tags
a4e47df4bbd2585a8cc8a79f731bd8e3a5eaa751
Commit Graph

865 Commits

Author SHA1 Message Date
kevinz000
09e5cd95a3 Merge pull request #9690 from Ghommie/Ghommie-cit308 
Unmodularize configuration, _globalvars and subsystems.
 2019-11-14 15:50:20 -07:00
kevinz000
af0962088c Merge pull request #9453 from Ghommie/Ghommie-cit226 
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
 2019-11-14 15:47:18 -07:00
kappa-sama
17d8998fef emergent gameplay 2019-11-13 16:58:51 -05:00
Ghommie
4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
kevinz000
d47f1f0518 Merge pull request #9756 from Ghommie/Ghommie-cit332 
turns on the chat subsystem (#47653)
 2019-11-10 11:03:53 -07:00
tralezab
354a257641 turns on the chat subsystem (#47653) 2019-11-10 00:05:59 +01:00
BlackMajor
a6bbe75c36 Merge pull request #9611 from Citadel-Station-13/supply-passive-gen 
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
 2019-11-08 14:17:17 +13:00
kevinz000
a750721fd2 Merge pull request #9653 from Poojawa/job-ordering 
Level Order listing
 2019-11-03 06:24:08 -07:00
Ghommie
100a87d57b Unmodularize configuration, _globalvars and subsystems. 2019-11-02 20:42:01 +01:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements 
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
 2019-10-29 21:42:32 -07:00
kevinz000
5ba86d2fc3 Merge pull request #9423 from Poojawa/NPC-Run-levels 
Boosts NPC runtime priority
 2019-10-29 21:35:17 -07:00
kevinz000
d64d1752b4 Merge pull request #9616 from deathride58/post512jukeboxes 
Makes jukeboxes work again after 512.1459's changes to SOUND_UPDATE (and other small fixes/tweaks)
 2019-10-29 21:25:12 -07:00
Poojawa
cbf74f63c8 Level Order listing 2019-10-29 00:00:48 -05:00
kevinz000
78174fcc06 Update shuttle.dm 2019-10-27 16:16:02 -07:00
deathride58
6cce995f77 Makes jukeboxes work again after 512.1459's changes to SOUND_UPDATE 2019-10-25 20:59:10 -04:00
MMMiracles
8fb0a68feb Adds Hat Throwing (#45355) 
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
 2019-10-25 16:19:19 -05:00
kevinz000
5f75664350 Update shuttle.dm 2019-10-25 09:35:59 -07:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
deathride58
39794a1dd8 150 hours of testing 2019-10-23 15:21:18 -04:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
Ghommie
ec22088534 Complying with suggestions. Also stops dnr observers from getting ghost role notifications 2019-10-20 09:15:35 +02:00
Ghommie
aa6860250b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-10-15 20:40:07 +02:00
deathride58
0c8b82168d Merge branch 'master' into Ghommie-cit222 2019-10-12 11:20:32 -04:00
Ghommie
b4e975ef75 mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes. 2019-10-09 06:51:07 +02:00
Ghommie
fce6f13471 Ports "Chat Subsystem ported from TerraGov-Marine-Corps" 2019-10-07 23:58:15 +02:00
Ghommie
31a6979c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-10-06 21:54:15 +02:00
Poojawa
0b00ffb4d0 Boosts NPC runtime priority 
Doesnt' effect idle NPCs, but once they wake up. WEW
 2019-10-06 00:00:27 -05:00
Fermi
89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
JTGSZ
5b3f6dca29 Species Job Check 2019-09-23 23:58:57 -04:00
Fermi
587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
Fermi
107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
deathride58
cc6e436e96 further fixes 2019-09-17 21:48:48 -04:00
deathride58
d0296a5e81 fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks 2019-09-17 20:15:06 -04:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa
f0afc9c490 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-13 12:59:15 -05:00
Poojawa
8988d1e506 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-11 02:41:36 -05:00
Alonefromhell
eee1ccbe2c merge oracle ui from kepler 2019-09-04 11:42:04 -05:00
nik707
624d717d08 Merge pull request #9168 from Seris02/loochotkey 
Adds looc hotkey - on examination, just makes it better
 2019-08-29 19:11:57 -05:00
Ghommie
f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-24 12:52:16 +02:00
Seris02
4fbbed3a43 adds looc hotkey 2019-08-20 14:32:48 +08:00
Poojawa
2922f08ef6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-17 23:41:28 -05:00
BlackMajor
13f27c040e Merge pull request #8848 from Citadel-Station-13/trait_blacklisting 
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
 2019-08-18 15:33:08 +12:00
Poojawa
3de3f511cf Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes 2019-08-15 08:24:55 -05:00
Poojawa
2b2bdb37ba Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 23:26:20 -05:00
BlackMajor
5dcd419d8a Merge pull request #8356 from Thalpy/master 
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
 2019-08-11 16:09:23 +12:00
Poojawa
d496e16dde Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 19:14:41 -05:00
Poojawa
f76bb27127 Fixes some runtimes and removes a holodeck exploit 
and a cleanup >.>;
 2019-08-08 21:33:42 -05:00
BurgerLua
810251a37c Fixed bug with voting 2019-08-07 20:47:36 -07:00
kevinz000
d6885d41a9 Update quirks.dm 2019-07-31 07:54:14 -07:00