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
10,332 Commits 55 Branches 0 Tags
f875d4e17659762ac01a32b239c8e200088d7af8
Commit Graph

3966 Commits

Author SHA1 Message Date
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
deathride58
b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
deathride58
ebf0817c76 Merge pull request #4338 from Citadel-Station-13/upstream-merge-33468 
[MIRROR] Designs now default to department flag ALL instead of NONE
 2017-12-15 04:21:56 +00: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
deathride58
d2d9cd7fc2 Update logout.dm 2017-12-14 19:12:27 -05:00
vuonojenmustaturska
c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
deathride58
e5671eece5 Merge pull request #4379 from Citadel-Station-13/upstream-merge-33298 
[MIRROR] Fixes zombie head removal
 2017-12-14 22:20:45 +00:00
oranges
382017cbe8 Merge pull request #33298 from QualityVan/zombrain 
Fixes zombie head removal
 2017-12-14 15:54:07 -06:00
Jordan Brown
253a3d519e Adds SDQL chat command (#33366) 
Allow's calling SDQL from bots supporting the CHAT system API
 2017-12-14 15:44:25 -06:00
deathride58
7b4e1b2e6b Update designs.dm 2017-12-14 14:38:10 -05:00
deathride58
4d61ea105d Update holder2.dm 2017-12-14 14:33:17 -05:00
deathride58
78f36fb424 Merge pull request #4365 from Citadel-Station-13/upstream-merge-33490 
[MIRROR] Fixes Cybernetic Lungs not being available in cyber_organs techweb node
 2017-12-14 19:31:58 +00:00
ShizCalev
712b86089d Adds new gun dry firing sounds (#33503) 
* Adds new gun dry firing sounds

* Don't want to hear click when you want to hear bang
 2017-12-14 06:15:11 -06:00
Epoc
b2f24a3773 Adds Cybernetic Lungs to cyber_organs techweb node (#33490) 2017-12-13 22:09:56 -06:00
deathride58
7ca4a29cac Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465 
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
 2017-12-14 03:54:31 +00:00
deathride58
fb492b5a14 Merge pull request #4355 from Citadel-Station-13/upstream-merge-33494 
[MIRROR] Fixes two unrelated runtimes
 2017-12-14 03:54:08 +00:00
deathride58
a4fafb2b51 Merge pull request #4357 from Citadel-Station-13/upstream-merge-33493 
[MIRROR] Fixes a couple Initialize procs
 2017-12-14 03:53:50 +00:00
deathride58
8f2d72ebc2 Merge pull request #4361 from Citadel-Station-13/upstream-merge-33497 
[MIRROR] Fixed several bad type checks in shuttle procs
 2017-12-14 03:53:32 +00: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
Cruix
2afb3c0368 Fixed several bad type checks in shuttle procs (#33497) 2017-12-13 21:09:23 -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
deathride58
2e83779018 Update destructive_analyzer.dm 2017-12-13 16:49:05 -05:00
deathride58
b11d1c024e Merge pull request #4342 from Citadel-Station-13/upstream-merge-33496 
[MIRROR] Fixes lobby stat entries not showing
 2017-12-13 21:48:14 +00:00
deathride58
dbd08a18a4 Merge pull request #4349 from Citadel-Station-13/upstream-merge-33481 
[MIRROR] Correctly set description of nonstandard cells
 2017-12-13 21:47:57 +00:00
deathride58
a6220057be Update filingcabinet.dm 2017-12-13 16:47:29 -05:00
deathride58
da0ecad1ee Update order.dm 2017-12-13 16:47:00 -05:00
deathride58
81d30a08e6 Update cas.dm 2017-12-13 16:44:52 -05:00
deathride58
9f5cef7748 Update cas.dm 2017-12-13 16:44:34 -05:00
Leo
77aa84af1d Fixes a couple Initialize procs 2017-12-13 14:13:43 -06:00
Leo
27c06118cb Merge pull request #33478 from ACCount12/another_explosion_fix 
Fixes yet another chem explosion throwing warnings
 2017-12-13 14:13:36 -06:00
Leo
51cce087d8 Fixes two unrelated runtimes 2017-12-13 14:12:26 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
deathride58
dc7dd2da3c Update dead.dm 2017-12-13 12:05:09 -05:00
deathride58
e46811d210 Update cell.dm 2017-12-13 12:03:21 -05:00
Jordan Brown
129cd705d1 Correctly set description of nonstandard cells 2017-12-13 09:12:55 -06:00
Kyle Spier-Swenson
73de2b7fe9 Changes the goonchat failed to load message since updating byond isn't needed anymore (#33474) 
It was a 511 beta that caused this issue, anybody still on 511 beta is not supported, They can move up to stable
 2017-12-12 22:51:21 -06:00
deathride58
046138b896 Merge pull request #4335 from Citadel-Station-13/upstream-merge-33458 
[MIRROR] Adds a chat command to reload admins in case someone locks themselves out.
 2017-12-13 01:24:36 +00:00
deathride58
6ad5b5030e Merge pull request #4343 from Citadel-Station-13/upstream-merge-33451 
[MIRROR] Fixes the free worker bee getting stuck in the hive and never leaving
 2017-12-13 01:24:01 +00:00
deathride58
6fc0cdc67e Merge pull request #4336 from Citadel-Station-13/upstream-merge-33457 
[MIRROR] Check ticks some more in dock()
 2017-12-13 01:22:52 +00:00
oranges
181afe9640 Fixes the free worker bee getting stuck in the hive and never leaving (#33451) 
ten outta ten code
 2017-12-12 15:57:49 -06:00
Jordan Brown
1bb487ebae Fixes lobby stat entries not showing 2017-12-12 15:56:38 -06:00
deathride58
5535509a65 fixes broken metabolism 2017-12-12 15:15:22 -05:00
Jordan Brown
c599e2fbc8 Designs now default to department flag ALL instead of NONE 2017-12-12 13:10:15 -06:00
Jordan Brown
367872f962 Merge pull request #33457 from ninjanomnom/check-your-tick 
Check ticks some more in dock()
 2017-12-12 13:05:49 -06:00
kevinz000
cc598d873c Adds a chat command to reload admins in case someone locks themselves out. (#33458) 
* Update chat_commands.dm

* skype
 2017-12-12 13:04:39 -06:00
AnturK
c5013d65f6 Adds "Get" command to movable vv dropdown (#33296) 2017-12-11 20:35:16 -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
deathride58
b5600cb91c Merge pull request #4328 from Citadel-Station-13/upstream-merge-33462 
[MIRROR] Ordered turfs quickfix
 2017-12-11 19:08:09 +00:00