shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,008 Commits 5 Branches 0 Tags
e595c2f2fceb6e64fa04b323d00a2e7b45d11866
Commit Graph

4928 Commits

Author SHA1 Message Date
Jordan Brown
e595c2f2fc Fixes adminwho having namecheck as a keyword 2017-10-12 12:22:51 -05:00
LetterJay
06061f0870 Merge pull request #3301 from Citadel-Station-13/upstream-merge-31530 
[MIRROR] Allows snoring while unconscious
 2017-10-12 12:37:03 -04:00
LetterJay
dc5aeb33e6 Merge pull request #3294 from Citadel-Station-13/upstream-merge-31475 
[MIRROR] Removes spawns from assembly code
 2017-10-12 12:36:53 -04:00
kevinz000
9deb3df6af Update material_container.dm (#31555) 2017-10-12 10:39:20 -05:00
LetterJay
41846d0793 Merge branch 'master' into upstream-merge-31599 2017-10-12 11:00:37 -04:00
LetterJay
4a8f3d0e41 fuck this shit 2017-10-12 09:58:16 -05:00
LetterJay
2e503acc57 Update assembly.dm 2017-10-12 06:21:30 -05:00
LetterJay
f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528 
[MIRROR] Minor refactor of how gas IDs are handled
 2017-10-12 07:19:30 -04:00
LetterJay
813e54e5ae Merge pull request #3322 from Citadel-Station-13/upstream-merge-31544 
[MIRROR] Server maint logs when nulls enter the clients list
 2017-10-12 07:19:21 -04:00
LetterJay
ec07e7b06f Merge pull request #3321 from Citadel-Station-13/upstream-merge-31541 
[MIRROR] Allows sillicons to use vending machines.
 2017-10-12 07:19:03 -04:00
LetterJay
3c55163ebd Merge pull request #3319 from Citadel-Station-13/upstream-merge-31464 
[MIRROR] Make SStgui actually read the html from the disk at runtime
 2017-10-12 07:18:42 -04:00
LetterJay
07f0a5f503 Merge pull request #3318 from Citadel-Station-13/upstream-merge-31365 
[MIRROR] Mega Carp Re-Carpening: Carpatastrophe!
 2017-10-12 07:18:35 -04:00
LetterJay
3ad9f5dc1e Merge pull request #3317 from Citadel-Station-13/upstream-merge-31500 
[MIRROR] sleeping carp grabs now put out a message
 2017-10-12 07:18:27 -04:00
LetterJay
d82459ae45 Merge pull request #3316 from Citadel-Station-13/upstream-merge-31548 
[MIRROR] Shameless Cleanbot Buff
 2017-10-12 07:18:18 -04:00
LetterJay
2a5ac01177 Merge pull request #3315 from Citadel-Station-13/upstream-merge-31550 
[MIRROR] Removes the ability to unweld a singletank
 2017-10-12 07:18:10 -04:00
LetterJay
1e87d0d2a2 Merge pull request #3314 from Citadel-Station-13/upstream-merge-31551 
[MIRROR] Added Banana Peels Inhand Sprites [Partial Fix - #30081]
 2017-10-12 07:17:57 -04:00
LetterJay
fe00337475 Merge pull request #3313 from Citadel-Station-13/upstream-merge-31545 
[MIRROR] Adds round ID to the banning panel
 2017-10-12 07:17:34 -04:00
LetterJay
9af6ffa946 Merge pull request #3311 from Citadel-Station-13/upstream-merge-31543 
[MIRROR] Datumizes world/Topic
 2017-10-12 07:16:44 -04:00
LetterJay
05100a0c6a Merge pull request #3310 from Citadel-Station-13/upstream-merge-31282 
[MIRROR] Reebe cogscarabs have infinite power and can recite scripture during non-clockcult rounds
 2017-10-12 07:16:35 -04:00
LetterJay
f19437bae9 Merge pull request #3307 from deathride58/crewobjtweaksgalore 
Crew Obj & Miscreant system optimizations and tweaks
 2017-10-12 07:16:13 -04:00
LetterJay
e15c337851 Merge pull request #3306 from Citadel-Station-13/upstream-merge-31449 
[MIRROR] Datum antag wizard.
 2017-10-12 07:15:53 -04:00
LetterJay
70818465da Merge pull request #3304 from Citadel-Station-13/upstream-merge-31517 
[MIRROR] Jungle Fever carriers now hear the proper antag sound
 2017-10-12 07:15:33 -04:00
LetterJay
38d2eebade Merge pull request #3303 from Citadel-Station-13/upstream-merge-31511 
[MIRROR] Fixes VVing associated values in lists when the value was a number.
 2017-10-12 07:15:22 -04:00
LetterJay
7b27e2d7ad Update filter.dm 2017-10-12 02:58:41 -05:00
LetterJay
301dbad665 Update life.dm 2017-10-12 02:58:02 -05:00
LetterJay
2edc2c66e9 Update vent_scrubber.dm 2017-10-12 02:57:54 -05:00
LetterJay
992416a9b4 Update carp.dm 2017-10-12 02:56:03 -05:00
LetterJay
7390bd82fd Update rightandwrong.dm 2017-10-12 02:55:28 -05:00
LetterJay
21f7e7d9e5 Update _compile_options.dm 2017-10-12 02:55:10 -05:00
LetterJay
6ed7f455b7 Update modifyvariables.dm 2017-10-12 02:54:26 -05:00
duncathan salt
e61b6aecd7 unfucks filters 2017-10-12 01:07:52 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Jordan Brown
acdc5c1380 Server maint logs when nulls enter the clients list (#31544) 2017-10-12 00:29:50 -05:00
Dax Dupont
856b6ba853 Allows sillicons to use vending machines. (#31541) 
* Allows borgs to use vending machines.

* Allows AI to use vending machines.
 2017-10-12 00:29:43 -05:00
Jordan Brown
24a85f97ab Make SStgui actually read the html from the disk at runtime (#31464) 
* Make SStgui actually read the html from the disk at runtime

* Remove the comment

* Back to "
 2017-10-12 00:29:28 -05:00
Armhulen
c269b062b9 Mega Carp Re-Carpening: Carpatastrophe! 2017-10-12 00:29:21 -05:00
oranges
9bd56416f8 Merge pull request #31500 from Armhulen/patch-7 
sleeping carp grabs now put out a message
 2017-10-12 00:29:14 -05:00
Incoming5643
5711f562f0 when cleanbot cleans a tile, it will now fully cleans the tile (#31548) 
As opposed to taking out one stain at a time
 2017-10-12 00:29:07 -05:00
PKPenguin321
33afe4f0ca Removes unwelding a singletank (#31550) 
Fixes #27341
 2017-10-12 00:28:58 -05:00
Mercenaryblue
17795f04c8 Added Banana Peels Inhand Sprites (#31551) 
Added in-hand Banana Peels sprites.
Default, Mime, and Bluespace.
 2017-10-12 00:28:51 -05:00
Jordan Brown
976797afb3 Adds round id to the banning panel (#31545) 2017-10-12 00:28:44 -05:00
Jordan Brown
1604f8b1d3 Datumizes world/Topic (#31543) 
* Datumizes world/Topic

* active_players requires comms_key
 2017-10-12 00:28:27 -05:00
Ashe Higgs
fa0aaa9870 Reebe cogscarabs have infinite power and can recite scripture during non-clockcult rounds (#31282) 
* During non-clock rounds, scarabs get more stuff

* Actually, admins might want to make scarabs...

* That's a thing
 2017-10-12 00:28:20 -05:00
deathride58
2a46696e55 cleans up comments 2017-10-11 18:26:10 -04:00
deathride58
1a3b0c6528 applies optimizations to miscreants 2017-10-11 18:07:08 -04:00
deathride58
bd18903e13 eh it works 2017-10-11 18:03:58 -04:00
LetterJay
5b4e26cb06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-11 08:06:03 -05:00
LetterJay
a75362cecc COLLAR 2017-10-11 08:05:49 -05:00
AnturK
5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
MoreRobustThanYou
0b86f2befe Jungle Fever carriers now hear the proper antag sound (#31517) 
* Jungle Fever carriers now here the proper antag sound

* less whitespace
 2017-10-10 22:18:05 -05:00