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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,296 Commits 55 Branches 0 Tags
aabbbb9dffb92e440a65bbadbae5c349ccecdc5c
Commit Graph

615 Commits

Author SHA1 Message Date
deathride58
1acdd3ce5c controllers sync 2018-01-03 23:23:11 -05:00
LetterJay
f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2018-01-02 05:16:13 -06:00
LetterJay
f786a90bad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 
# Conflicts:
#	code/controllers/subsystem/idlenpcpool.dm
 2018-01-02 04:37:36 -06:00
LetterJay
9ede14fbce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 2018-01-01 14:14:06 -06:00
LetterJay
d3f6cf4dd8 Merge branch 'master' into upstream-merge-33537 2017-12-30 13:14:48 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
Buggy123
2c40a61968 Increases research point income by 33% (#33857) 2017-12-29 02:55:10 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
Leo
868fbec32d Merge pull request #33881 from AnturK/walls-have-eyes 
Makes reset_perspective handle turf as eye
 2017-12-29 00:28:18 -06:00
deathride58
df14e129f4 Merge pull request #4528 from Citadel-Station-13/upstream-merge-33708 
[MIRROR] Adds random seed feedback
 2017-12-28 02:59:01 +00:00
LetterJay
a034383e15 Merge pull request #4449 from Citadel-Station-13/upstream-merge-33627 
[MIRROR] dock() re-organization
 2017-12-27 07:01:40 -06:00
LetterJay
e2d2c8cda0 Merge branch 'master' into upstream-merge-33627 2017-12-27 04:41:27 -06:00
LetterJay
4cfb2e323b Merge branch 'master' into upstream-merge-33504 2017-12-26 06:08:12 -06:00
Jordan Brown
08b2224007 Adds random seed feedback (#33708) 
* Master now sets rand_seed

* Blackbox now records Master.random_seed
 2017-12-25 19:05:36 -06:00
LetterJay
06c309fb0c Merge branch 'master' into upstream-merge-33562 2017-12-21 11:30:58 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJay
678762209a Update ticker.dm 2017-12-19 15:33:31 -06:00
deathride58
d39b0204fa Merge pull request #4382 from Citadel-Station-13/upstream-merge-33307 
[MIRROR] Adds config inclusion system
 2017-12-19 19:49:32 +00:00
deathride58
65412db421 Update game_options.dm 2017-12-19 14:34:06 -05:00
Emmett Gaines
8cf30a65fb dock() re-organization 2017-12-18 21:23:58 -06:00
LetterJay
2205500863 Update idlenpcpool.dm 2017-12-18 15:15:21 -06:00
LetterJay
781f40926c Merge pull request #4394 from Citadel-Station-13/upstream-merge-33530 
[MIRROR] Fix shuttle autocalls when the round is already over
 2017-12-17 21:24:12 -06:00
vuonojenmustaturska
8cbad06f35 Advanced mob laziness 2017-12-17 19:36:04 -06:00
LetterJay
69930a192d Update networks.dm 2017-12-17 17:51:28 -06:00
LetterJay
1412836201 Update orbit.dm 2017-12-17 17:51:20 -06:00
LetterJay
26543ea97f Update configuration.dm 2017-12-17 17:50:43 -06:00
LetterJay
9cbe879b51 Update comms.dm 2017-12-17 17:47:12 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
oranges
75753a4dfd Defines all subsystem priority values 2017-12-15 17:00:50 -06:00
Jordan Brown
9adb77c5e3 Merge pull request #33530 from AutomaticFrenzy/patch/autocall 
Fix shuttle autocalls when the round is already over
 2017-12-15 14:53:30 -06:00
Jordie
4727d8f73c Fixes LoadEntries return value 2017-12-15 10:01:46 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
oranges
05db439c1e SSinput tweaks to address server side lag 2017-12-14 23:11:52 -06:00
deathride58
fdb9de488e Merge pull request #4359 from Citadel-Station-13/upstream-merge-33480 
[MIRROR] Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
 2017-12-15 04:21:34 +00:00
vuonojenmustaturska
c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
Jordan Brown
d45b668a39 Adds config inclusion system 2017-12-14 17:24:13 -06:00
Jordie
70abf6d8e9 Saves newscaster data and photos to round logs folder 2017-12-14 03:44:14 -06:00
deathride58
da65aaab28 Merge pull request #4364 from Citadel-Station-13/upstream-merge-33456 
[MIRROR] Adds a parent level subsystem initialized var
 2017-12-14 03:53:02 +00:00
Emmett Gaines
d517c797ab adds a parent level subsystem initialized var (#33456) 2017-12-13 21:11:51 -06:00
JStheguy
9313fd65cf Adds Additional Electronic_Assembly Designs (#33466) 
* bloats electronic_setups.dmi

* new assembly naming scheme, redone legacy sprites
 2017-12-13 21:10:41 -06:00
Kyle Spier-Swenson
55247e9bdf Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on. 2017-12-13 21:04:00 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
deathride58
d6573f602d Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148 
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
 2017-12-10 23:50:20 +00:00
deathride58
2a481e69df Merge pull request #4307 from Citadel-Station-13/upstream-merge-33400 
[MIRROR] Fix catch all blackbox vv guard
 2017-12-10 22:36:09 +00:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
deathride58
215a8f47ed Merge pull request #4304 from Citadel-Station-13/upstream-merge-33423 
[MIRROR] Undelaying roundend will now reboot the server normally.
 2017-12-10 21:43:26 +00:00