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
9096f03ad3
Merge pull request #8654 from Ghommie/Ghommie-cit54
...
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00
kevinz000
d5041b7dde
Merge pull request #9582 from Putnam3145/dynamic-config
...
Adding dynamic rules to the game config
2019-10-24 18:55:29 -07:00
Ghommie
fc1f10c97f
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
Putnam
7050ec281d
wow do NOT want those
2019-10-23 02:14:03 -07:00
Putnam
67662d1d69
everything works now
2019-10-22 21:39:28 -07:00
Putnam
9dd4d6a93c
silly errors
2019-10-22 20:07:26 -07:00
Putnam
bacc875524
added actual game configs to all the dynamic modes
2019-10-22 19:12:54 -07:00
kevinz000
9e63413911
Merge pull request #9466 from deathride58/yawnborgs
...
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
2019-10-21 01:04:34 -07:00
kevinz000
8be030a931
Merge pull request #9482 from Thalpy/Wiki
...
Gives chemistry a library (and updates buttons at the top right of the game too).
2019-10-17 13:01:37 -07:00
Thalpy
764c3e5757
Missed one
2019-10-13 16:38:05 +01:00
Thalpy
fc08d06352
Reverts 3/4 link buttons
2019-10-13 16:36:38 +01:00
Thalpy
7b27d9bd24
Library time
2019-10-13 16:19:32 +01:00
deathride58
0c8b82168d
Merge branch 'master' into Ghommie-cit222
2019-10-12 11:20:32 -04:00
Thalpy
3abbfffdb8
Argh
2019-10-12 13:20:39 +01:00
deathride58
60749f8b07
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
2019-10-11 14:33:32 -04:00
kevinz000
dcb37bfd0e
Merge pull request #9418 from Ghommie/Ghommie-cit216
...
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07: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
Ghommie
e31c441b3d
rogue tabbing
2019-10-05 07:52:52 +02:00
Ghommie
3d22f4ec60
Porting a load of disease/symptoms code updates.
2019-10-05 07:14:25 +02: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
nik707
bfd17d66cd
Merge pull request #9074 from Citadel-Station-13/donator_grouping
...
Donator grouping system
2019-08-29 18:31:23 -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
kevinz000
fb2971e3e6
Merge remote-tracking branch 'origin/master' into donator_grouping
2019-08-15 14:40:44 -07: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
277971971f
s
2019-08-07 13:07:38 -07:00
kevinz000
d6885d41a9
Update quirks.dm
2019-07-31 07:54:14 -07:00
Ghommie
72413c893f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
2019-07-27 01:38:20 +02:00
Poojawa
8c63ea7b6d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-26 17:36:46 -05:00
kevinz000
d976dd016a
Merge remote-tracking branch 'origin/master' into trait_blacklisting
2019-07-25 15:20:46 -07:00
kevinz000
f8fdbfc211
Update quirks.dm
2019-07-21 02:30:19 -07:00
