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,949 Commits 55 Branches 0 Tags
37bb75a6458634143759b166f1b68a2fb6151924
Commit Graph

472 Commits

Author SHA1 Message Date
oranges
c3dbb8925b Merge pull request #31987 from Cyberboss/InlineCO 
May as well shave some yaks
 2017-10-26 05:05:09 -05:00
LetterJay
06942978b1 Merge pull request #3561 from Citadel-Station-13/upstream-merge-32017 
[MIRROR] Fixes a SET_CONFIG bug
 2017-10-23 14:51:06 -04:00
LetterJay
ec7c39fb0a Merge pull request #3555 from Citadel-Station-13/upstream-merge-31950 
[MIRROR] Removes an empty New()
 2017-10-23 14:49:16 -04:00
Jordan Brown
5c0e88722e Merge pull request #32017 from ACCount12/patch-1 
Fixes a SET_CONFIG bug
 2017-10-22 23:38:37 -05:00
Jordan Brown
88133e6f60 Removes an empty New() 2017-10-22 11:31:46 -05:00
vuonojenmustaturska
1794018ae1 Removes mob.lastattacked and replaces lastattacker with a string 2017-10-22 11:29:35 -05:00
Jordan Brown
7d9162d608 Logs subsystem shutdowns (#31951) 2017-10-21 13:27:21 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
LetterJay
bb00cb7075 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-19 09:01:55 -05:00
LetterJay
b6293e7ece potential IRC fix 2017-10-19 09:01:15 -05:00
vuonojenmustaturska
360d883879 expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778) 
* Initial commit

* Time is a circus

* Send in the clowns

* i broke something

* Revert "i broke something"

This reverts commit 5a29c40d131b39effe9ebcb6c8c1883693baf07f.

* I think it works?

* cleanup

* define reminders

* Fixes tendrils and such

* sentience_act now moves the mob to AI_OFF state
 2017-10-19 04:57:49 -05:00
LetterJay
250f55e072 Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630 
[MIRROR] Datum rev & related upgrades to base datum antag
 2017-10-18 07:42:54 -04:00
AnturK
2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
Leo
28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup 
Cleans up some istypes not using helpers
 2017-10-17 19:21:14 -05:00
LetterJay
568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599 
[MIRROR] Moves projectile processing to a subsystem
 2017-10-16 10:39:41 -04:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
AnturK
64b1be05ff Adds logging crew manifest to seperate file (#31665) 
* Adds logging crew manifest to seperate file

* Coding blind

* i can spel words

* Not everyone in the lobby please.

* Proper header

* Fix

* Better format
 2017-10-15 16:56:48 -05:00
Jordan Brown
44ca2d67f6 Merge pull request #31663 from ninjanomnom/shuttle-subsystem 
Repopulates SSshuttle recover
 2017-10-14 18:49:24 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05: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
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
f19437bae9 Merge pull request #3307 from deathride58/crewobjtweaksgalore 
Crew Obj & Miscreant system optimizations and tweaks
 2017-10-12 07:16:13 -04:00
Jordan Brown
acdc5c1380 Server maint logs when nulls enter the clients list (#31544) 2017-10-12 00:29:50 -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
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
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
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
JamieH
9eb83d1598 Fix a bug in the new lobby music system (#31477) 
* Fix a bug in the new lobby music system

* Update ticker.dm

* ...
 2017-10-10 13:14:50 -05:00
Leo
0a1b40c01e Merge pull request #31466 from tgstation/Cyberboss-patch-2 
Makes config loading messages consistent
 2017-10-09 16:03:47 -05:00
vuonojenmustaturska
7cec0bbf67 Adds time dilation data to the feedback table (#31278) 
* adds time dilation data to the feedback table

* Revert "adds time dilation data to the feedback table"

This reverts commit bed0bd78b6e24be7da8269f6af24e51f0c90ded7.

* adds time dilation data to the feedback table 2: electric boogaloo

* Changes
 2017-10-08 15:38:15 -05:00
LetterJay
1b03aabf03 Merge pull request #3231 from Citadel-Station-13/upstream-merge-31352 
[MIRROR] Allows easy hosting of server side lobby music
 2017-10-08 16:24:06 -04:00
LetterJay
9f1c6cef0c Merge branch 'master' into upstream-merge-31371 2017-10-08 15:37:46 -04:00
LetterJay
981c9b07bc Merge pull request #3205 from Citadel-Station-13/upstream-merge-31374 
[MIRROR] High pop reduced MC processing mode.
 2017-10-08 15:36:39 -04:00
JamieH
2f41af546e Allows easy hosting of server side lobby music (#31352) 
* Allows easy hosting of server side lobby music

* No images here!!!

* Undelete /tg/ sounds... REEE

* Add back the old system and use it if this doesn't find any music

* Documentation++

* Update round_start_sounds.txt

* Allow for rare map specific title music

Also don't attempt to play non-valid sounds/non-sounds

* Fix bad sound filter, fix common sounds

* Update README.txt

* Update ticker.dm

* Update ticker.dm
 2017-10-08 13:17:01 -05:00
deathride58
5d0853e16a Crew objective/miscreant system tweaks (#3213) 
* Loadsa tweaks

* adds miscreant pref, other fixes

* fixes runtime

* fixes compiling errors for REAL now hopefully

* HOPEFULLY fixes compiling errors

* COMPILE!
 2017-10-08 10:05:40 -07:00
CitadelStationBot
f579a3bf74 [MIRROR] Fix adding bad config entries (#3219) 
* Fixes adding bad config entries (#31390)

* Fix adding bad config entries
 2017-10-07 23:04:14 -07:00
LetterJay
4a2d9f82a1 Update config.dm 2017-10-07 23:06:35 -05:00
Kyle Spier-Swenson
988dd75850 Allows editing config.allow_admin_ooccolor 2017-10-07 12:38:17 -05:00
Jordan Brown
91aa560f0d High pop reduced MC processing mode. 2017-10-07 08:42:43 -05:00
LetterJay
5a65cdc939 Merge branch 'master' into upstream-merge-31309 2017-10-07 01:07:59 -04:00
LetterJay
fe27aa586c Merge pull request #3181 from Citadel-Station-13/upstream-merge-31336 
[MIRROR] Fixes lighting object initialization on new zlevels.
 2017-10-07 01:05:11 -04:00
Jordan Brown
b17a770299 Config option to automatically call the shuttle for high casualties (#31309) 2017-10-06 21:35:49 -05:00
Leo
32fa3cf86b Merge pull request #31336 from AnturK/Fixes-lighting-on-away-missions 
Fixes lighting object initialization on new zlevels.
 2017-10-06 07:11:47 -05:00
deathride58
5692228379 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:41 -04:00
deathride58
5cefa71992 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:03 -04:00
JJRcop
65a997f929 Hosts can lock config options from admins (#31254) 
* Hosts can lock config options from admins

* Optimization of LoadEntries

a very very very small one
 2017-10-04 14:59:33 -05:00
Jordan Brown
f1dfc1b6db Merge pull request #31252 from MrStonedOne/whatthefuckcyberboss 
Partial revert of #30763 (datum config refactor)
 2017-10-03 17:55:05 -05:00
LetterJay
cc93f1e546 Merge pull request #3074 from Citadel-Station-13/upstream-merge-31127 
[MIRROR] Chat command to notify admins when the round ends
 2017-10-01 23:53:41 -04:00