 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
|
ba2a6d6626
|
Merge pull request #9145 from Trilbyspaceclone/patch-212
gives drones a RPD
|
2019-08-21 08:15:08 -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 |
|
|
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 |
|
|
TrilbySpaceClone
|
044ef51dfa
|
Relies on a PR
|
2019-08-20 18:32:39 -04:00 |
|
|
Seris02
|
4fbbed3a43
|
adds looc hotkey
|
2019-08-20 14:32:48 +08:00 |
|
|
Sishen
|
7a8e2c3f50
|
rebalances the lawyer heirloom briefcase while giving it a fancy new sprite
|
2019-08-19 17:54:16 -04: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 |
|
|
Trilbyspaceclone
|
d1404a84d8
|
Update backpack.dm
|
2019-08-19 07:03:54 -04: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
|
3f734d9aca
|
Merge pull request #8763 from Trilbyspaceclone/patch-188
Reblances bone satchles
|
2019-08-18 23:39:39 -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 |
|
|
kevinz000
|
17a522300c
|
Update hardsuit.dm
|
2019-08-18 20:05:42 -07:00 |
|
|
Poojawa
|
f130bfe32e
|
Merge branch 'job-menu-improvements' of https://github.com/Poojawa/Citadel-Station-13-portworks into job-menu-improvements
|
2019-08-18 21:27:03 -05:00 |
|
|
Poojawa
|
43541b043d
|
Update warden.dm
|
2019-08-18 21:27:00 -05:00 |
|
|
Poojawa
|
70e3964fd2
|
Update head_of_security.dm
|
2019-08-18 21:22:10 -05:00 |
|
|
Code-Cygnet
|
c8810be706
|
Update captain.dm
|
2019-08-18 22:15:52 -04:00 |
|
|
Code-Cygnet
|
5840284e9e
|
Update alcohol_reagents.dm
Edited a typo at line 2144.
|
2019-08-18 22:14:41 -04:00 |
|
|
Code-Cygnet
|
32695f28cf
|
Merge branch 'master' into The-Art-of-Drunken-Captaining
|
2019-08-18 22:12:23 -04:00 |
|
|
Code-Cygnet
|
a351d8f995
|
Update captain.dm
Attempted error fix.
|
2019-08-18 21:34:31 -04:00 |
|
|
Sishen
|
8fdb1c59d5
|
Update dynamic_rulesets_roundstart.dm
|
2019-08-18 21:16:07 -04:00 |
|
|
lolman360
|
323073f8d4
|
Merge pull request #6 from Trilbyspaceclone/patch-213
Patch 213
|
2019-08-19 11:12:50 +10:00 |
|
|
Sishen
|
2ad94dccac
|
Update dynamic_rulesets_roundstart.dm
|
2019-08-18 21:11:16 -04:00 |
|
|
Poojawa
|
9cbd8af5b9
|
Updates colors, fixes alignment issues.
|
2019-08-18 14:38:10 -05:00 |
|
|
kevinz000
|
2c000636dd
|
Update hardsuit.dm
|
2019-08-18 07:24:58 -07:00 |
|
|
Poojawa
|
5d33321f80
|
Merge remote-tracking branch 'refs/remotes/origin/job-pref-jonks' into job-menu-improvements
|
2019-08-18 07:46:00 -05:00 |
|
|
Poojawa
|
867b112158
|
HOW DID THIS NOT GET UPDATED????
|
2019-08-18 07:44:46 -05:00 |
|
|
Poojawa
|
c4198296d0
|
and this too
|
2019-08-18 04:26:30 -05:00 |
|
|
Poojawa
|
5e03f5be3d
|
Update shaft_miner.dm
|
2019-08-18 04:24:48 -05:00 |
|
|
Poojawa
|
b5da43c1b7
|
Gives Sec Officers back their stun combat weapons
|
2019-08-18 04:04:05 -05:00 |
|
|
Poojawa
|
933db4d05f
|
reverts the overly greyish colors back to vibrant ones
|
2019-08-18 01:00:16 -05:00 |
|
|
TrilbySpaceClone
|
e1cee15720
|
seed
|
2019-08-18 01:40:36 -04:00 |
|