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 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,111 Commits 55 Branches 0 Tags
b33d2b82fbf1cb41ab41394547b8bcdb708b88b5
Commit Graph

853 Commits

Author SHA1 Message Date
kevinz000
b33d2b82fb Merge branch 'master' into mirror-38933 2018-07-14 15:26:49 -07:00
kevinz000
bcb1b04c40 Upstream mirror 2018-07-14 15:24:35 -07:00
deathride58
891bdd718d Merge pull request #7083 from Citadel-Station-13/kevinz000-patch-8 
nerfs techwebs passive generation, pushes back full max time by 15 minutes
 2018-07-06 01:38:42 -04:00
deathride58
b2ec8f89e0 missed files 2018-07-05 01:27:07 -04:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
deathride58
63013f8964 everything to controllers 2018-07-02 00:10:31 -04:00
LetterJay
b2fb67c607 Merge pull request #7248 from Citadel-Station-13/upstream-merge-38683 
[MIRROR] Fixes anomaly area selection.
 2018-07-01 09:26:38 -05:00
LetterJay
605f7a1bf6 Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675 
[MIRROR] Fixed cyborgs not getting their names at round start
 2018-07-01 09:24:46 -05:00
kevinz000
2f77e5894c Update research.dm 2018-06-26 16:39:22 -07:00
Jordan Brown
888b04427c Merge pull request #38683 from AnturK/anomalyfix 
Fixes anomaly area selection.
 2018-06-25 09:18:40 -05:00
LetterJay
cdd285f5c7 Update job.dm 2018-06-24 23:30:28 -05:00
LetterJay
d79b85d719 trims a few issues during mirror merges 2018-06-24 18:42:24 -05:00
LetterJay
acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574 
[MIRROR] Global component signals
 2018-06-24 18:20:17 -05:00
LetterJay
922e2a4515 Merge pull request #7200 from Citadel-Station-13/upstream-merge-38584 
[MIRROR] Adds /datum/DBQuery/proc/SetQuery
 2018-06-24 15:11:23 -05:00
LetterJay
06c7cebb82 Merge pull request #7188 from Citadel-Station-13/upstream-merge-38319 
[MIRROR] [READY] Helps data disks stop being unemployed
 2018-06-24 15:07:14 -05:00
LetterJay
6685bfcc8b Update dbcore.dm 2018-06-24 15:04:24 -05:00
CitrusGender
d50ae43d7f Fixed cyborgs not getting their names at round start 2018-06-24 13:55:03 -05:00
Jordan Brown
fcfdf968d1 Adds /datum/DBQuery/proc/SetQuery (#38584) 
* Adds /datum/DBQuery/proc/SetQuery

* Needful newness
 2018-06-20 02:18:53 -05:00
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
JStheguy
02744c59a5 [READY] Helps data disks stop being unemployed (#38319) 
* data cards actually have a function now

* Adds data cards to the IC printer for real rea

* more cards, less shitty code

* how the fuck did I miss that

adds a missing ..()

* wait wrong use of ..() fuck
 2018-06-19 09:23:33 -05:00
Jordan Brown
2cd045b8fe [s] Fixes direct sql datum call exploit. 2018-06-19 09:10:51 -05:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
AnturK
09414f87d4 Fixes R&D display runtime (#38501) 2018-06-16 06:15:40 -05:00
CitadelStationBot
f7924732c0 [MIRROR] Legacy config warning only happens if any legacy configs are present (#7089) 
* Legacy config warning only happens if any legacy configs are present (#38421)

* Legacy config warning only happens if any legacy configs are present
 2018-06-15 02:43:15 -07:00
CitadelStationBot
226780e0ed [MIRROR] Fixes vote ss trying to remove actions of people who already voted. (#7099) 
* Fixes votes trying to remove actions of people who already voted. (#38431)

* Fixes vote ss trying to remove actions of people who already voted.
 2018-06-13 19:30:14 -07:00
kevinz000
052f752c22 techwebs nerf 2018-06-12 14:24:55 -07:00
deathride58
de3e4ecec7 Merge pull request #6968 from Citadel-Station-13/upstream-merge-38186 
[MIRROR] Fix First Death not being remembered if DB is not in use
 2018-06-11 02:02:21 +00:00
CitadelStationBot
6d9543511f [MIRROR] Fixes loading zlevels with static lighting. (#7051) 
* Fixes loading zlevels with static lighting. (#38365)

* Fixes loading zlevels with static lighting.

* Actually this whole part is unnecessary now because change turf handles the change properly now.

* Correct

* Fixes loading zlevels with static lighting.
 2018-06-10 12:32:58 -07:00
deathride58
e4fcf46cfd Merge branch 'master' into upstream-merge-38186 2018-06-09 05:54:28 +00: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
deathride58
aab6a78305 Merge pull request #6960 from Citadel-Station-13/upstream-merge-38165 
[MIRROR] Adds config for monkey cap
 2018-06-05 23:38:54 +00:00
vuonojenmustaturska
83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
deathride58
b3b9a44689 Merge branch 'master' into upstream-merge-38165 2018-06-05 21:53:14 +00:00
LetterJay
eac5206e51 Merge pull request #6990 from Citadel-Station-13/upstream-merge-38077 
[MIRROR] Antag reputation rewards are now configurable
 2018-06-05 12:10:07 -05:00
deathride58
a57bda822b Update game_options.dm 2018-06-03 22:19:13 -04:00
Tad Hardesty
9f4f470607 Delay smoothing atoms that have not initialized yet (#38173) 2018-06-03 14:25:35 -05:00
Jordan Brown
7be9b6ebf9 Antag reputation rewards are now configurable 2018-06-03 09:03:51 -05:00
KorPhaeron
4b38136d79 Only load Reebe during clock cult (#38156) 
* Only load clock cult during clock cult

* Return FALSE
 2018-06-03 09:02:55 -05:00
LetterJay
4c876d9612 Update blackbox.dm 2018-06-02 07:27:13 -05:00
LetterJay
f51552c68a Update game_options.dm 2018-06-02 07:21:53 -05:00
Jordie
2d650450df Fix First Death not being remembered if DB is not in use 2018-06-01 05:27:59 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
Jordan Brown
db20e34d76 Adds config for monkey cap 2018-05-31 22:41:12 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
CitadelStationBot
8502508c21 [MIRROR] Anomalies can now be deconstructed for techwebs for 10k points (#6850) 
* Anomalies can now be deconstructed for techwebs for 10k points

* Update research.dm
 2018-05-27 17:26:36 -07:00
LetterJay
54510e95b1 Merge pull request #6904 from Citadel-Station-13/upstream-merge-38055 
[MIRROR] Enable Goonchat ping during the lobby
 2018-05-26 18:40:25 -05:00
LetterJay
c512fe52c8 Merge pull request #6898 from Citadel-Station-13/upstream-merge-38008 
[MIRROR] Fixes some edge cases in sstimer that could cause a timer to run before it was expecting to.
 2018-05-26 18:38:07 -05:00
Jordan Brown
cf4ef9a59f Merge pull request #38055 from AutomaticFrenzy/patch/ssping-lobby 
Enable Goonchat ping during the lobby
 2018-05-25 11:06:36 -05:00
Jordan Brown
6e9cad688c Merge pull request #38008 from MrStonedOne/ISawSSTimerFloatingInMyDreams 
Fixes some edge cases in sstimer that could cause a timer to run before it was expecting to.
 2018-05-25 10:51:56 -05:00