 Linzolle
|
9651ae45b1
|
love to work with merge conflicts
|
2019-08-24 20:27:47 -05:00 |
|
|
Rob Bailey
|
5e94a5db80
|
ports #44155 from /tg/station
|
2019-08-24 20:21:44 -05:00 |
|
|
Poojawa
|
b01f135d3a
|
addresses a few concerns
|
2019-08-24 19:09:56 -05:00 |
|
|
TrilbySpaceClone
|
4878510c2b
|
Fixes that make this complie
|
2019-08-24 19:46:51 -04:00 |
|
|
TrilbySpaceClone
|
db317b65af
|
Grand!
|
2019-08-24 19:39:15 -04:00 |
|
|
Ghommie
|
24fe7126c4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-08-24 19:05:51 +02:00 |
|
|
Ghommie
|
5d1cac62da
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-08-24 13:50:22 +02: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 |
|
|
Poojawa
|
d60ba0a207
|
Fixes missing DNA info for slimes, resolves virology issues
|
2019-08-24 04:14:47 -05:00 |
|
|
Sishen
|
20f4e260e1
|
minigun ooga
|
2019-08-23 19:39:20 -04:00 |
|
|
Sishen
|
3f86a92efa
|
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
|
2019-08-23 14:42:35 -04:00 |
|
|
Ghommie
|
2ce01b3bda
|
Removes an obnoxious temporary overlay var.
|
2019-08-23 19:57:57 +02:00 |
|
|
Ghommie
|
106cd7b845
|
Fixes "Blood Cult Conversion Prompt Issues"
|
2019-08-23 19:38:39 +02:00 |
|
|
Linzolle
|
62a51d8df5
|
infinite sword exploit
|
2019-08-23 01:25:46 -05:00 |
|
|
Linzolle
|
7a481f4354
|
TABS
|
2019-08-23 01:08:53 -05:00 |
|
|
deathride58
|
9a32d437a5
|
grants poly the ability to speak through the TGS relay (with a 0.01% chance)
|
2019-08-22 20:33:12 -04:00 |
|
|
JTGSZ
|
e6dbaf8473
|
this should work
|
2019-08-22 13:02:01 -04:00 |
|
|
lolman360
|
c618ce114d
|
Ebb
|
2019-08-22 14:18:49 +10:00 |
|
|
deathride58
|
ea9eaedf1a
|
Ports BeeStation/BeeStation-Hornet#345
|
2019-08-21 22:16:44 -04:00 |
|
|
kevinz000
|
2f9ca28d38
|
this is bad performance and probably unnecessary but juuust in case..
|
2019-08-21 08:17:34 -07:00 |
|
|
kevinz000
|
25a7d3af51
|
Merge pull request #8968 from Trilbyspaceclone/patch-199
Fixes dead/used face huggers from still infecting
|
2019-08-21 08:16:06 -07:00 |
|
|
kevinz000
|
7fe2d2b5f2
|
Merge pull request #9142 from Trilbyspaceclone/patch-211
removes glue from nukies/clownops uplinks
|
2019-08-21 08:11:44 -07:00 |
|
|
kevinz000
|
3f6256d945
|
Update all_nodes.dm
|
2019-08-21 08:06:08 -07:00 |
|
|
kevinz000
|
3c59b43ff7
|
Update shotgun.dm
|
2019-08-21 06:39:18 -07:00 |
|
|
Poojawa
|
32c7a7c3ee
|
Virology's broken as fuck, damnifino why
|
2019-08-21 03:36:40 -05:00 |
|
|
Poojawa
|
b29607c019
|
It's working again, I guess. wtf
|
2019-08-21 01:36:59 -05:00 |
|
|
kevinz000
|
2f39bb3d56
|
Update necropolis_chests.dm
|
2019-08-20 21:59:50 -07:00 |
|
|
kevinz000
|
c694248f5a
|
Update necropolis_chests.dm
|
2019-08-20 21:58:48 -07:00 |
|
|
Poojawa
|
23333f6ea5
|
reverts the majority of clean act because it doesn't work properly otherwise
|
2019-08-20 23:03:31 -05:00 |
|
|
TrilbySpaceClone
|
044ef51dfa
|
Relies on a PR
|
2019-08-20 18:32:39 -04:00 |
|
|
Poojawa
|
bda3ac8745
|
blood dna is fixed, your ERP code is too
|
2019-08-20 07:41:50 -05:00 |
|
|
Poojawa
|
96834bc517
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-20 03:36:17 -05:00 |
|
|
Code-Cygnet
|
d6c9daa4eb
|
Update drinks_recipes.dm
Fixed more errors, spelling and id errors to be exact with the help of Papa Pax :D.
|
2019-08-19 16:04:16 -04:00 |
|
|
Code-Cygnet
|
e7d08d1fed
|
Update drinks_recipes.dm
Fixed error at line 803, allies_cocktail to alliescocktail. Am bone-head :(.
|
2019-08-19 15:53:13 -04:00 |
|
|
Code-Cygnet
|
167b18d045
|
Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
Error spotted at 2138 and fixed by Sishen, aka Papa Pax!
Co-Authored-By: Sishen1542 <sishen1542@gmail.com>
|
2019-08-19 15:28:51 -04:00 |
|
|
Sishen
|
ed2c3f3cbd
|
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
|
2019-08-19 13:53:05 -04:00 |
|
|
TrilbySpaceClone
|
6c6391b4c4
|
Merge branch 'master' into fruit
|
2019-08-19 07:37:12 -04:00 |
|
|
Trilbyspaceclone
|
cce33ec7e5
|
Update drink_reagents.dm
|
2019-08-19 07:17:57 -04:00 |
|
|
Poojawa
|
cede93299e
|
REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
|
2019-08-19 04:48:37 -05:00 |
|
|
BlackMajor
|
dbe50db261
|
Merge pull request #8349 from Trilbyspaceclone/patch-124
Removes Nitryl bounty but adds 7 more in!
|
2019-08-19 20:07:40 +12:00 |
|
|
Poojawa
|
8ad705ec74
|
Update curator.dm
|
2019-08-19 02:16:30 -05:00 |
|
|
kevinz000
|
1ab64d4003
|
Update ert.dm
|
2019-08-18 23:43:31 -07:00 |
|
|
kevinz000
|
86cb735cc9
|
Merge branch 'master' into kevinz000-patch-64
|
2019-08-18 23:41:40 -07:00 |
|
|
kevinz000
|
47dd8d22eb
|
Merge pull request #9149 from Trilbyspaceclone/padding_and_such
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
|
2019-08-18 23:37:56 -07:00 |
|
|
kevinz000
|
3ef29bbbeb
|
Merge pull request #9097 from lolman360/durathread
Adds durathread.
|
2019-08-18 23:37:07 -07:00 |
|
|
kevinz000
|
8a96b29ef9
|
Merge pull request #9137 from Sishen1542/the-d-boiz
addition of the "assistant response team" a pack of assistants sent in from CComm
|
2019-08-18 23:34:49 -07:00 |
|
|
kevinz000
|
558ea557f8
|
Merge pull request #9151 from Trilbyspaceclone/cloak
Adds chameloen necktie item
|
2019-08-18 23:34:03 -07:00 |
|
|
kevinz000
|
ec349ae347
|
Merge pull request #9134 from Arturlang/Nanite-sloime-heals
Nanite Adv toxin healing now heals slimes
|
2019-08-18 23:33:02 -07:00 |
|
|
kevinz000
|
f55682d6dd
|
Merge pull request #9136 from Sishen1542/strained
strained muscles now costs chems to use, slows chem regen, and drains stacking stamina over time
|
2019-08-18 23:32:47 -07:00 |
|
|
kevinz000
|
86cfd8a561
|
Merge pull request #9141 from deathride58/removwarpwissle
Actually fixes warp whistle runtimes
|
2019-08-18 23:32:15 -07:00 |
|