Ghommie
a95b13c24a
jetpack fixes too & co
2019-10-23 19:31:54 +02:00
Ghommie
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
Ghommie
ba307b01a5
Defib fixes and chem effects stuff
2019-10-23 13:45:57 +02: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
r4d6 and GitHub
cdb9d40bae
Add departemental Winter Coats to loadout
2019-10-22 14:38:09 -04:00
kevinz000
f96e1bbe33
lmao
2019-10-22 01:59:45 -07:00
Poojawa
6fc750dca0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-21 19:13:19 -05:00
kevinz000 and GitHub
1d649c27de
Update robot_movement.dm
2019-10-21 14:38:38 -07:00
kevinz000 and GitHub
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 and GitHub
838575da50
Merge pull request #9503 from deathride58/tasernerf
...
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
2019-10-21 00:59:58 -07:00
kevinz000
95b81b5938
fix
2019-10-21 00:55:15 -07:00
kevinz000
c6c2a703e5
Merge remote-tracking branch 'origin/master' into magrifles_again
2019-10-21 00:47:03 -07:00
Ghommie
7e9298d5ac
Fixing radio emotes conflict with drunk memes.
2019-10-20 12:21:21 +02:00
kevinz000 and GitHub
c59f15a8bc
Merge pull request #9529 from BlackMajor/Yeet
...
Syndicate paper masks no longer work in pockets
2019-10-19 19:53:40 -07:00
Poojawa
ffeae20daa
Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods
2019-10-18 06:01:52 -05:00
BlackMajor
d39897b9ad
Update phantomthief.dm
2019-10-18 23:34:31 +13:00
kevinz000 and GitHub
9c21659afc
Merge pull request #9483 from ZeroNetAlpha/toylathe-fix
...
Update toylathe.dm
2019-10-17 12:55:43 -07:00
kevinz000 and GitHub
5e049bc64a
Merge pull request #9514 from Linzolle/kevin-has-a-foot-fetish
...
foot fetish content for kevin (ankle coverings)
2019-10-17 12:49:08 -07:00
kevinz000 and GitHub
a7a238eafd
Merge pull request #9504 from Poojawa/vore-UI-improvements
...
Vore fixes and optimizations
2019-10-17 12:48:01 -07:00
Poojawa
66c8c17bbd
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-17 05:45:06 -05:00
Ghommie
475303bd02
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-10-17 00:50:30 +02:00
Linzolle
1690596047
you asked for this kevin
2019-10-16 15:53:11 -05:00
kevinz000 and GitHub
994bfddc1b
Merge pull request #9477 from Thalpy/tgOrganFixes
...
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
2019-10-16 12:44:34 -07:00
BlackMajor and GitHub
e8649e5c3c
Merge pull request #9506 from izzyinbox/bark
...
Adds *bark emote
2019-10-16 21:00:15 +13:00
Poojawa
184e81eec0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-16 01:51:51 -05:00
Zna12
64819066c6
Update toylathe.dm
...
Think I fixed it.
2019-10-16 01:15:35 -05:00
kevinz000 and GitHub
11a93d41de
Merge pull request #9499 from r4d6/patch-1
...
Add a Blindfold to the loadout list
2019-10-15 22:57:02 -07:00
izzyinbox
7a91bb4cd3
Adds *bark emote
2019-10-15 10:24:08 -05:00
deathride58 and GitHub
9fd4e7f673
Merge pull request #9472 from Thalpy/Quickfixforfood
...
[speedmerge] Quickfixforfood and fixes the chem hindenburg
2019-10-15 06:32:59 -04:00
deathride58 and GitHub
26d4a2d943
Merge pull request #9493 from Ghommie/Ghommie-cit234
...
SDGF ghost poll message made terse, other tweaks.
2019-10-15 06:27:58 -04:00
Poojawa
d5d878e93e
moved the values up
2019-10-15 04:09:46 -05:00
Poojawa
ff21b992ad
Move files and tweaks vore panel stuff
2019-10-15 03:35:00 -05:00
deathride58
50c27df28f
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
2019-10-15 03:48:44 -04:00
deathride58
b3a81dce01
Secborg buffs - Adds incapacitation functionality to k9 jaws, gives secborg a hybrid taser, tweaks pounces, adds config option to weaken secborgs
2019-10-14 18:18:32 -04:00
r4d6 and GitHub
a824998b89
Add a Blindfold to the loadout list
2019-10-14 11:48:14 -04:00
Ghommie
321c30cf89
now with 51% more loads.
2019-10-14 06:24:54 +02:00
Ghommie
3671755142
My cat resting on my neck is just sooo warm, like a best scarf.
2019-10-14 06:06:25 +02:00
Poojawa
bcb11a471d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-13 19:14:16 -05:00
Jay
02b78a2817
changes donator item from glasses to a hat
2019-10-13 17:47:11 -05:00
Thalpy
06599523a9
Ghommie is a saint
2019-10-13 22:06:57 +01:00
kevinz000 and GitHub
adeb33cdae
Merge pull request #9463 from Owai-Seek/minor-fixes
...
Updating Kinkmate item-list
2019-10-13 13:54:26 -07:00
Zna12
023d031f15
Update toylathe.dm
...
Cleans up the autoylathe code, brings it back in line with the current autolathe. Also fixes an issue with the autoylathe not updating it's screen on click.
2019-10-13 14:40:19 -05:00
Thalpy
3b8ea30d9b
I did it
2019-10-12 20:06:46 +01:00
Thalpy
f6796b93b3
Fixes graft
2019-10-12 18:22:48 +01:00
and Fermi
2e03985696
aaaa
2019-10-12 07:55:19 +01:00
Poojawa
394c947d14
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-11 23:10:45 -05:00
kevinz000 and GitHub
a9dcf681ce
Merge pull request #9457 from Ghommie/Ghommie-cit227
...
Fixing a runtime when examining unloaded cit hyposprays.
2019-10-11 12:16:50 -07:00
kevinz000 and GitHub
2e74833e72
Merge pull request #9444 from Thalpy/Updates-holder
...
[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
2019-10-11 12:08:12 -07: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
Ghommie