cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,008 Commits 55 Branches 0 Tags
2a68dce1edb9f19f3b8b08d7fe674417fa5d8f93
Commit Graph

2838 Commits

Author SHA1 Message Date
Jordan Brown
2a68dce1ed Fixes ruins spawning over shuttle docks 2017-10-12 16:02:39 -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
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
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
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
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
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
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
Armhulen
c269b062b9 Mega Carp Re-Carpening: Carpatastrophe! 2017-10-12 00:29:21 -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
deathride58
bd18903e13 eh it works 2017-10-11 18:03:58 -04:00
AnturK
5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
Kyle Spier-Swenson
4c10fe270f Fixes VVing associated values in lists when the value was a number. 2017-10-10 22:17:56 -05:00
kingofkosmos
abcc74b327 Allows the snore-emote while unconscious. (#31530) 2017-10-10 22:15:33 -05:00
LetterJay
3f6596dc17 Merge pull request #3300 from Citadel-Station-13/upstream-merge-31406 
[MIRROR] Adds Slappers
 2017-10-10 22:34:28 -04:00
LetterJay
56f7bcddcc Merge pull request #3296 from Citadel-Station-13/upstream-merge-31443 
[MIRROR] Fixes pandemic no beaker UI runtime
 2017-10-10 22:33:33 -04:00
LetterJay
822f15f4ae Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494 
[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 22:32:52 -04:00
LetterJay
5e99ad27e5 Merge pull request #3287 from Citadel-Station-13/upstream-merge-30920 
[MIRROR] Adds the Chemistry Smoke Machine
 2017-10-10 22:31:27 -04:00
LetterJay
74fbde6801 Merge pull request #3284 from Citadel-Station-13/upstream-merge-31495 
[MIRROR] Diseases will now cure if species is changed
 2017-10-10 22:29:58 -04:00
LetterJay
f1124cf376 Merge pull request #3282 from Citadel-Station-13/upstream-merge-31356 
[MIRROR] Cleans up atmos unary machinery code
 2017-10-10 22:28:29 -04:00
LetterJay
ad3b59c247 Merge pull request #3281 from Citadel-Station-13/upstream-merge-31498 
[MIRROR] Fixes emote runtimes
 2017-10-10 22:28:14 -04:00
deathride58
c163176e5d Adds Slappers (#31406) 
* ADDS SLAPPERS

* fixes everything, just need sprites

* nerfs criticism
 2017-10-10 19:54:30 -05:00
kevinz000
3d0f0dd7f0 Fixes pandemic no beaker UI runtime (#31443) 2017-10-10 13:51:37 -05:00
MoreRobustThanYou
5eb76bb6e1 Removes spawns from assembly code 2017-10-10 13:30:59 -05:00
Jordan Brown
7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war 
In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 13:28:38 -05:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920) 
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
 2017-10-10 13:13:38 -05:00
MoreRobustThanYou
bc318af840 Diseases will now cure if species is changed (#31495) 
* Diseases will now cure if species is changed

* Update _disease.dm

* Update _disease.dm

* Update species.dm
 2017-10-10 12:41:42 -05:00
nicbn
c8cfb3abeb Cleans up atmos unary machinery code (#31356) 
* Cleans up atmos unary machinery code

* return 0 and return are different things: cryo.dm

* same: oxygen generator

* same: vent pump

* same: vent scrubber

* Reveiw

* Update vent_scrubber.dm

* Update vent_scrubber.dm
 2017-10-10 12:28:12 -05:00
AnturK
e880545425 Fixes emote runtimes (#31498) 
* Emote runtime

* Bleh didn't add all
 2017-10-10 08:42:30 -05:00
Leo
ed3a031543 Merge pull request #31497 from AnturK/cyberboss-pls 
Fixes some tempremoves
 2017-10-10 07:10:35 -05:00
LetterJay
9d7877cd02 Merge pull request #3277 from Citadel-Station-13/upstream-merge-31012 
[MIRROR] Syndicate turrets (and other machines in walls) can now be hit by projectiles. Also reworks target priorities.
 2017-10-10 05:56:18 -04:00