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-16 12:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,182 Commits 55 Branches 0 Tags
cd5317d1375d6e4efc901b807b9f52f52460699b
Commit Graph

92 Commits

Author SHA1 Message Date
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
LetterJay
1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
ShizCalev
67841c3f19 Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-03 09:04:08 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
Jordan Brown
9f8ef69014 Merge pull request #37986 from AutomaticFrenzy/patch/sneaky-cyberboss 
Fix global proccalls not working
 2018-05-22 22:12:30 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
Jordan Brown
1a25c685a1 Update DMAPI to version 3.2.1.0 2018-05-08 21:33:58 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
vuonojenmustaturska
6ed0eee3f6 Merge pull request #36980 from tgstation/Cyberboss-patch-1 
Prevents direct Del() calls
 2018-04-07 19:47:13 -05:00
CitadelStationBot
7c036d7ca1 [MIRROR] Select Equipment works on observers (#5554) 
* Merge pull request #35728 from coiax/select-equipment-on-ghosts

Select Equipment works on observers

* Select Equipment works on observers
 2018-02-17 17:46:36 -06:00
Leo
a5650cccc4 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals. 2018-02-16 12:18:21 -06:00
deathride58
49a5a5cddc Fixes cancelling equipment selection being equivalent to selecting "Naked" (#34557) 
* nerfs butterfingers, throws in bonus preorder exclusive cancel button

* Update debug.dm
 2018-01-19 09:16:22 -06:00
deathride58
e14795291d Merge pull request #4889 from Citadel-Station-13/upstream-merge-34319 
[MIRROR] Fails travis on common mapping mistakes
 2018-01-17 20:12:39 +00:00
oranges
c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps 
Fails travis on common mapping mistakes
 2018-01-16 14:37:26 -06:00
oranges
9dda16954b Merge pull request #34457 from AutomaticFrenzy/patch/air-status 
Combine and fix Show Air Status and Air Status in Location
 2018-01-16 14:29:29 -06:00
oranges
96f17eebb2 Merge pull request #34155 from deathride58/rudimentaryoutfitequip 
Allows admins to select an outfit while transforming a mob to human via rudimentary transform
 2018-01-13 04:18:38 -06:00
Leo
337ed7f0a6 Merge pull request #34189 from ShizCalev/test-area-tick 
CHECK_TICK & logging for cmd_admin_areatest
 2018-01-11 07:40:41 -06:00
deathride58
ca4c2da248 Merge pull request #4718 from Citadel-Station-13/upstream-merge-34074 
[MIRROR] Updates test areas debug command
 2018-01-08 20:04:28 +00:00
ShizCalev
f54854bca8 Updates test areas debug command (#34074) 
* Sanity check for test areas debug command

* Shifted to popup window
 2018-01-08 04:39:09 -06:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
oranges
d960c45e77 Merge pull request #33622 from duncathan/assert_gas 
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-20 00:14:13 -06:00
LetterJay
3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519 
[MIRROR] Finishes the forceMove port
 2017-12-17 20:28:07 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08: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
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
deathride58
d8e1562fcf Merge pull request #3995 from deathride58/manualsyncsreeEEEE 
Manual map syncs + manual mirrors of missed upstream map PRs
 2017-11-20 05:12:06 +00:00
deathride58
eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
deathride58
7669ea4820 and copypasta falls out of my pocket 2017-11-17 22:14:09 -05:00
deathride58
fb62491701 manual map syncs + manual missed pr mirrors 2017-11-17 21:34:49 -05:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
LetterJay
c3b60e502e Merge pull request #3882 from Citadel-Station-13/upstream-merge-32371 
[MIRROR] SSoverlay improvements and tweaks
 2017-11-14 14:56:34 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Kyle Spier-Swenson
2d8fc6de61 SSoverlay improvements and tweaks (#32371) 
* Overlay per-type cost logging.

Overlays will now log how long each type took to process.

Changed up how overlays was done to account for the fact its a queue and not a processor. (it was using almost none of the processing subsystem framework)

Made the overlay loop faster by making it not cut the list until the end.

Added a simple generic benchmark stat tracking system.

I don't know how much overhead this adds to overlays. i may put it behind testing or something, but i do want to test this on the serbers to get some stats.

* Removes flush() as it was creating race conditions

* Use ref

* text2file

* Atoms added as an overlay will have their pending overlays compiled before being converted to an appearance
 2017-11-10 13:26:23 -06:00
LetterJay
254ffca3b7 Merge pull request #3668 from Citadel-Station-13/upstream-merge-32162 
[MIRROR] Actually fixes meteors, again
 2017-10-29 15:49:40 -04:00
LetterJay
47cfffbb26 Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116 
[MIRROR] Line by line profiling system
 2017-10-29 15:48:47 -04:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
vuonojenmustaturska
d6d01ab630 Actually fixes meteors, again (#32162) 
* Actually fixes meteors, again

* unrelated typo fix for an admin debug verb
 2017-10-29 07:13:31 -05:00
oranges
c00c1dcc00 Merge pull request #32127 from tgstation/Cyberboss-patch-3 
[s] Blocks world proc calls
 2017-10-27 17:35:20 -05:00
Jordan Brown
f36d3ff08a Line by line profiling system 2017-10-27 13:10:21 -05:00
LetterJay
5337b1fed2 Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780 
[MIRROR] Disentangles blob from blob mode/removes blob mode
 2017-10-22 16:39:35 -04: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