shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,486 Commits 5 Branches 0 Tags
cd38bccf01c586c8d997d1007803cf96cf51e7a1
Commit Graph

9793 Commits

Author SHA1 Message Date
kevinz000
cd38bccf01 why 2018-04-08 19:40:28 -07:00
deathride58
120457d8fd Merge pull request #6088 from Citadel-Station-13/FixesItAll 
Makes sure the server can never ever crash ever again
 2018-04-08 04:18:37 +00:00
deathride58
ed2de4a61e Merge pull request #6115 from Poojawa/metabreaking 
Metabreaks event reports
 2018-04-08 04:17:35 +00:00
CitadelStationBot
43baad50f1 [MIRROR] Add on-map sprites for pre-enabled atmos pumps (#6300) 
* Add on-map sprites for pre-enabled atmos pumps

* Update volume_pump.dm

* Update pump.dm
 2018-04-07 22:38:32 -05:00
Poojawa
a491e364c3 Adjust permissions for Admin Observers (#6247) 
* adjusts permissions for the new political officer

* Update admin_verbs.dm

* adds +ADMIN checks to ahelp replies

* Update admin_verbs.dm
 2018-04-07 22:33:42 -05:00
deathride58
832939d3ac Merge pull request #6282 from Citadel-Station-13/upstream-merge-36989 
[MIRROR] Logs the load away mission verb.
 2018-04-08 02:25:25 +00:00
deathride58
1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560 
[MIRROR] [READY]AI latejoins
 2018-04-08 02:25:10 +00:00
deathride58
cf134192cc Merge pull request #6302 from Citadel-Station-13/upstream-merge-36871 
[MIRROR] Shuttle garbage collection
 2018-04-08 02:24:54 +00:00
deathride58
c4c7ac7a3e Merge pull request #6301 from Citadel-Station-13/upstream-merge-36980 
[MIRROR] Prevents direct Del() calls
 2018-04-08 02:24:37 +00:00
kevinz000
e8561ec98c Shuttle garbage collection (#36871) 
* Shuttle garbage collection

* istype
 2018-04-07 19:50:27 -05:00
vuonojenmustaturska
6ed0eee3f6 Merge pull request #36980 from tgstation/Cyberboss-patch-1 
Prevents direct Del() calls
 2018-04-07 19:47:13 -05:00
AnturK
3de992aee2 Fixes cow tipping properly (#37015) 2018-04-07 18:15:00 -05:00
deathride58
a3f9995f0f Merge pull request #6280 from Citadel-Station-13/upstream-merge-36976 
[MIRROR] fixes cows moving while tipped
 2018-04-07 00:54:52 +00:00
deathride58
71344ce953 Merge pull request #6281 from Citadel-Station-13/upstream-merge-36975 
[MIRROR] Removes a sound
 2018-04-07 00:54:31 +00:00
deathride58
57f0cc35b5 Update mapping.dm 2018-04-06 20:54:12 -04:00
deathride58
b88da782aa Update job.dm 2018-04-06 20:53:15 -04:00
deathride58
4739836bd9 Merge pull request #6283 from Citadel-Station-13/upstream-merge-36994 
[MIRROR] Fixes window spawner names
 2018-04-07 00:51:12 +00:00
deathride58
b53b81455a Merge pull request #6285 from Citadel-Station-13/upstream-merge-36961 
[MIRROR] Fixes mixed blood samples to preserve cloneable if the samples are the same
 2018-04-07 00:50:56 +00:00
deathride58
d79d4ae3f1 Merge pull request #6286 from Citadel-Station-13/upstream-merge-36973 
[MIRROR] Fixes null reference not pulsing the 'not scanned' output
 2018-04-07 00:50:40 +00:00
deathride58
863ca69d3f Merge pull request #6288 from Citadel-Station-13/upstream-merge-36920 
[MIRROR] READY flash fixes
 2018-04-07 00:50:23 +00:00
deathride58
36c9094155 Merge pull request #6289 from Citadel-Station-13/upstream-merge-36956 
[MIRROR] Fixes trash bin wrenching message
 2018-04-07 00:49:53 +00:00
deathride58
bae5e5c81d Merge pull request #6291 from Citadel-Station-13/upstream-merge-36997 
[MIRROR] Fixes dead chat announcements not using real name.
 2018-04-07 00:49:33 +00:00
deathride58
df879ce1ca Merge pull request #6292 from Citadel-Station-13/upstream-merge-36872 
[MIRROR] GC debugging features
 2018-04-07 00:48:47 +00:00
deathride58
475fba9bd9 Merge pull request #6294 from Citadel-Station-13/upstream-merge-36627 
[MIRROR]  fixes #34388 by adding cam
 2018-04-07 00:46:51 +00:00
AnturK
45a8c65739 Adds kickback to mecha weapons. (#36999) 2018-04-06 14:43:11 -05:00
Tlaltecuhtli
4f7d35ec4f fixes #34388 by adding cam (#36627) 
* wip fixes #34388

🆑 
fix:stuff
🆑

* vv

* ASDASD

* daikshu

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* 99999999999999999999999999999

* *tabs*

* Update comp_board_designs.dm
 2018-04-06 09:24:47 -05:00
Jordan Brown
0ddf202682 Merge pull request #36872 from kevinz000/totally_not_a_feature 
GC debugging features
 2018-04-06 09:17:11 -05:00
Jordan Brown
554ed22603 Merge pull request #36997 from DaxDupont/is-this-real-life 
Fixes dead chat announcements not using real name.
 2018-04-06 09:08:48 -05:00
Jordan Brown
4dbd06b9a2 Merge pull request #36956 from vuonojenmustaturska/anchorbin 
Fixes trash bin wrenching message
 2018-04-06 09:07:20 -05:00
PKPenguin321
41b90f01e2 READY flash fixes (#36920) 
* flash fixes

* switches to get_turf

* fixes the fix

* parent call and comment

added the comment so it doesnt get removed again by accident
 2018-04-06 04:05:19 -05:00
robbym
a4e5a1d02c Fixes null reference not pulsing the 'not scanned' output (#36973) 2018-04-06 03:44:32 -05:00
SailorDave
107ccfda10 Tweaks mixed blood samples to preserve cloneable if the samples are the same (#36961) 2018-04-06 01:54:15 -05:00
kevinz000
38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
vuonojenmustaturska
aaf3bb66cf Merge pull request #36994 from 81Denton/window-spawner-names 
Fixes window spawner names
 2018-04-06 00:44:16 -05:00
AnturK
0efb82be90 Logs the load away mission verb. 2018-04-06 00:44:06 -05:00
Jordan Brown
7cddf61b94 Merge pull request #36975 from KorPhaeron/sound2 
Removes a sound
 2018-04-06 00:43:56 -05:00
Jordan Brown
66dabf4ff7 Merge pull request #36976 from Iamgoofball/patch-422 
fixes cows moving while tipped
 2018-04-06 00:43:38 -05:00
LetterJay
49fd917fee Merge pull request #6252 from Citadel-Station-13/kevinz000-patch-4 
looc now obeys ooc bans
 2018-04-05 07:35:43 -05:00
deathride58
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815 
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
 2018-04-05 00:17:27 +00:00
kevinz000
3d26bf4355 Worse than ERP 2018-04-04 14:27:50 -07:00
kevinz000
f94ff21968 readds handholding 2018-04-04 14:24:57 -07:00
deathride58
f4ebb8d2e9 Merge pull request #6228 from Citadel-Station-13/kevinz000-patch-1 
Nerfs beam rifle effectiveness vs blob
 2018-04-04 21:20:12 +00:00
deathride58
a8a7754b22 Merge pull request #6256 from Citadel-Station-13/upstream-merge-36598 
[MIRROR] Fixes bloodbath effects not working on people in crit
 2018-04-04 21:16:21 +00:00
deathride58
5f215ff2b4 Merge pull request #6257 from Citadel-Station-13/upstream-merge-36733 
[MIRROR] podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?)
 2018-04-04 21:15:55 +00:00
deathride58
63ed2b0069 Merge pull request #6259 from Citadel-Station-13/upstream-merge-36711 
[MIRROR] Fixed sometimes using items on full storage items
 2018-04-04 21:14:13 +00:00
deathride58
c702e9b097 Merge pull request #6260 from Citadel-Station-13/upstream-merge-36927 
[MIRROR] Adds more moth names to prevent duplicate random names
 2018-04-04 21:13:23 +00:00
deathride58
8ad42c519a Merge pull request #6261 from Citadel-Station-13/upstream-merge-36928 
[MIRROR] Removes @
 2018-04-04 21:12:45 +00:00
deathride58
ef7b79eea7 Merge pull request #6262 from Citadel-Station-13/upstream-merge-36945 
[MIRROR] Removes april fools from heirlooms
 2018-04-04 21:12:26 +00:00
deathride58
af8862bd78 Merge pull request #6263 from Citadel-Station-13/upstream-merge-36867 
[MIRROR] Fixes 0 value not being saved in constant memory circuits
 2018-04-04 21:11:44 +00:00
deathride58
cd251d79b2 Merge pull request #6264 from Citadel-Station-13/upstream-merge-36645 
[MIRROR] Fixes mannitol not curing minor brain traumas
 2018-04-04 21:11:28 +00:00