shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,480 Commits 5 Branches 0 Tags
6fdbee9f2f643ac716aaebae90eb04c2da0cefa2
Commit Graph

1547 Commits

Author SHA1 Message Date
CitadelStationBot
2da7322cca [MIRROR] Gives ghost roles their own assigned_roles (#1887) 
* Gives ghost roles their own assigned_roles

* Update ghost_role_spawners.dm

* Delete ghost_role_spawners.dm.rej
 2017-07-06 14:15:12 -05:00
CitadelStationBot
24e0c88263 Removes the hot variants of necropolis tiles and walls (#1885) 2017-07-06 13:20:38 -05:00
LetterJay
db9b069075 re-adds headpatting (#1903) 2017-07-06 10:29:58 -07:00
LetterJay
dd70580a72 Merge pull request #1901 from Citadel-Station-13/upstream-merge-28992 
[MIRROR] Adds Necropolis curses for cursed items in Necropolis ruins
 2017-07-06 11:22:24 -05:00
LetterJay
c62086af13 Merge pull request #1900 from Citadel-Station-13/upstream-merge-28877 
[MIRROR] Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut.
 2017-07-06 10:56:52 -05:00
LetterJay
76c6b0b854 Merge pull request #1899 from Citadel-Station-13/upstream-merge-29052 
[MIRROR] Increases freedom of the freedom suit
 2017-07-06 10:52:20 -05:00
LetterJay
223c95940d Merge pull request #1898 from Citadel-Station-13/upstream-merge-29008 
[MIRROR] Cleans up posibrain code
 2017-07-06 10:52:06 -05:00
LetterJay
67194851a8 Merge pull request #1897 from Citadel-Station-13/upstream-merge-29032 
[MIRROR] Tweaks the blood-drunk miner
 2017-07-06 10:51:39 -05:00
CitadelStationBot
4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -05:00
LetterJay
e9664c734e Merge pull request #1895 from Citadel-Station-13/upstream-merge-28942 
[MIRROR] Fixes being unable to dig plants out of soil
 2017-07-06 10:04:17 -05:00
LetterJay
69dea00ba6 Merge pull request #1894 from Citadel-Station-13/upstream-merge-28958 
[MIRROR] Replaces all instances of spawn() with addtimer/INVOKE_ASYNC
 2017-07-06 10:04:01 -05:00
CitadelStationBot
9c5b764058 Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut. 2017-07-06 09:53:35 -05:00
CitadelStationBot
80083bed73 Increases freedom of the freedom suit 2017-07-06 09:46:23 -05:00
CitadelStationBot
eb7f6c515b Cleans up posibrain code 2017-07-06 09:43:16 -05:00
CitadelStationBot
b555dce39f Tweaks the blood-drunk miner 2017-07-06 09:40:05 -05:00
LetterJay
2871a73236 Merge pull request #1891 from Citadel-Station-13/upstream-merge-29043 
[MIRROR] Fixes holodeck not having the correct area
 2017-07-06 09:27:01 -05:00
LetterJay
1471cbe936 Merge pull request #1889 from Citadel-Station-13/upstream-merge-29036 
[MIRROR] Fixes heartbeat sounds playing indefinitely in certain cases
 2017-07-06 09:25:11 -05:00
CitadelStationBot
fa37fcd12b Fixes being unable to dig plants out of soil 2017-07-06 09:15:09 -05:00
CitadelStationBot
beccb4742f Replaces all instances of spawn() with addtimer/INVOKE_ASYNC 2017-07-06 09:14:03 -05:00
CitadelStationBot
10e85b488f Fixes holodeck not having the correct area 2017-07-06 09:09:43 -05:00
CitadelStationBot
21878a77f0 Fixes heartbeat sounds playing indefinitely in certain cases 2017-07-06 08:26:23 -05:00
CitadelStationBot
431d8050aa Fixes the legion door admin report/logging 2017-07-06 08:26:19 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
Poojawa
36a1898bde Dogborg balance tweaks (#1805) 
* Update dogborgstuff.dm

* Compile fixes

* minor code standards tweaks
 2017-07-05 10:01:57 -05:00
CitadelStationBot
a1ff07ed1f [MIRROR] Organs for catgirls (#1457) 
* Organs for catgirls

* Delete tgstation.dme.rej

* Update tgstation.dme
 2017-07-05 09:12:59 -05:00
LetterJay
cc3b59d9b0 Merge pull request #1866 from Citadel-Station-13/upstream-merge-28988 
[MIRROR] Fixes pods not counting as escape
 2017-07-03 17:38:04 -05:00
CitadelStationBot
f02411ad9e [s] Makes cookie alert private (#1865) 2017-07-03 15:14:38 -07:00
CitadelStationBot
21ef6c18b3 Fixes pods not counting as escape 2017-07-03 17:14:27 -05:00
CitadelStationBot
793a2ce28f Grammar and message tweaks (#1722) 2017-07-01 21:22:29 -07:00
CitadelStationBot
82e8b54738 Mesons work on lavaland again (#1802) 2017-07-01 21:21:59 -07:00
CitadelStationBot
7b89ab66a2 Fixes reskinned guns being invisible (#1851) 2017-07-01 21:21:03 -07:00
CitadelStationBot
ac16176c20 Fixes deathgasping while being cloned (#1852) 2017-07-01 21:20:47 -07:00
CitadelStationBot
73557a5e5f Fixes cardboard tube duping (#1854) 2017-07-01 21:20:39 -07:00
CitadelStationBot
8627946f72 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once (#1753) 2017-06-30 21:22:45 -07:00
CitadelStationBot
471380aa2c Makes movement delay calculation not round to the tick (#1711) 2017-06-30 21:20:26 -07:00
CitadelStationBot
b5025653b6 Luxury shelter capsules' display cases no longer spawn offhand objects (Fixes #28589) (#1694) 2017-06-30 20:57:00 -07:00
CitadelStationBot
ca2d03a082 Moves transit space to separate z level. (#1696) 2017-06-30 20:56:45 -07:00
CitadelStationBot
0831c68ad3 Lowercases the names of most glasses, changes the thermonocle's description based on its examiner (#1775) 2017-06-30 20:53:24 -07:00
CitadelStationBot
488f6350ed Revert "Freezers and heaters now drop the correct materials" (#1819) 2017-06-30 20:49:04 -07:00
CitadelStationBot
fce1875d73 Observers can see through some alternate apperances (#1829) 2017-06-30 20:47:57 -07:00
CitadelStationBot
a9a2a29dd4 Fix the lobby menu not showing when the mysql connection had ghosted (#1839) 2017-06-30 20:47:36 -07:00
CitadelStationBot
1ad4947e58 Adds a small recovery window to variable length megafauna attacks for more predictable melee resolution (#1844) 2017-06-30 20:47:21 -07:00
CitadelStationBot
01456fddf1 Fixed small spelling + punctuation errors (#1716) 2017-06-30 20:46:40 -07:00
CitadelStationBot
9d5e51777b use_power var now uses a define to reflect it not being a bool (#1842) 2017-06-30 20:41:59 -07:00
LetterJay
c32da6e2cb Merge pull request #1840 from Citadel-Station-13/upstream-merge-28932 
[MIRROR] Show ban id to banned players
 2017-06-30 22:38:26 -05:00
CitadelStationBot
d105e57af1 Do not use your brain, do not look at the code, do not engage me (#1818) 2017-06-30 20:21:34 -07:00
katnep
45ce2c4caa STIMPACKS POWERCREEP EDITION (#1828) 
* STIMPACKS POWERCREEP EDITION

added stimpacks and stimpack kits to the vendor
as well as my patented powercreep kit of survival pens

* FIXING IT

Having my own file is overrated

* more fixes

Still fixing it

* FINAL FORM

Fixed it.jpeg

* FINAL FIX

THIS IS FIXING BEYOND FIXING

* GO BEYOND

* IM GONNA PUNCH IT
 2017-06-30 20:12:10 -07:00
CitadelStationBot
83da8141f4 Fixes SM getting energy when hit in space. (#1723) 2017-06-30 18:41:49 -07:00
CitadelStationBot
871aef4597 Show ban id to banned players 2017-06-30 14:23:05 -05:00
LetterJay
735b25c6e3 Merge branch 'master' into upstream-merge-28916 2017-06-30 10:36:11 -05:00