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-14 03:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,022 Commits 55 Branches 0 Tags
15b51f6c6cb7a745f2ef714fb8eda2b1752a0ed2
Commit Graph

6756 Commits

Author SHA1 Message Date
deathride58
15b51f6c6c Merge pull request #4297 from Citadel-Station-13/upstream-merge-33384 
[MIRROR] Allows for qdel in shuttleMove procs
 2017-12-10 03:06:31 +00:00
deathride58
79bbf1085b Merge pull request #4298 from Citadel-Station-13/upstream-merge-33389 
[MIRROR] Fixes spelling error
 2017-12-10 03:06:18 +00:00
deathride58
7d3739dddb Merge pull request #4296 from Citadel-Station-13/upstream-merge-33397 
[MIRROR] Fixes emergency lights having infinite power, and replaces their magic number with a define
 2017-12-10 03:06:03 +00:00
Jordan Brown
ae48e14876 Merge pull request #33371 from ninjanomnom/walk-backwards-into-hell 
Step backwards version of hex2num
 2017-12-09 15:54:14 -06:00
Jordan Brown
0c93857bc5 Merge pull request #33389 from LuigiBoi/patch-1 
Fixes spelling error
 2017-12-09 15:54:06 -06:00
Jordan Brown
b6653dd94c Merge pull request #33384 from ninjanomnom/deletes-in-my-shutle-subsystem 
Allows for qdel in shuttleMove procs
 2017-12-09 15:53:57 -06:00
Jordan Brown
2029473a48 Merge pull request #33397 from Xhuis/em_light_fix 
Fixes emergency lights having infinite power, and replaces their magic number with a define
 2017-12-09 15:53:49 -06:00
LetterJay
edce62494d Merge pull request #4082 from deathride58/donoritemmodularization 
Donator item modularization + manual sync of sprites with upstream + manual mirrors + donor item fixes
 2017-12-09 15:52:44 -06:00
kevinz000
75eab09dff Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets." 2017-12-08 19:16:49 -08:00
deathride58
742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
 2017-12-08 19:58:41 -05:00
Kyle Spier-Swenson
811517ecb2 [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets. (#33098) 
* Timer queuing tweaks: binary sorted inserts and rolling buckets.

Client time timers now uses a binary search algorithm for its sorted inserts.

Processing now uses a binary sorted insert, rather then sorting it with sortTim during bucket_shifts.

Buckets now automatically wrap around rather then get regenerated every minute. (Rolling queue)

* Fixes some queue management bugs.

* Fixes a Order of Operations goof up in the ticks<->ds macros.

@ninjanomnom your pain is my success

* Remove debug line

* Fixes some binary insert bugs, fixes client time timers, moved id over to GUID

* Fixes initialization-time timers fucking everything up
 2017-12-08 15:02:18 -06:00
deathride58
a8311d6adf Merge pull request #4263 from Citadel-Station-13/upstream-merge-33341 
[MIRROR] Fixes mugs being called "broken bottles"
 2017-12-08 20:24:51 +00:00
deathride58
7ca945c96b Merge pull request #4278 from Citadel-Station-13/upstream-merge-33370 
[MIRROR] Fixes certain material containers
 2017-12-08 19:35:43 +00:00
deathride58
4600a6eb87 Update drinks.dm 2017-12-08 14:07:33 -05:00
deathride58
0c8bdab295 Merge pull request #4279 from Citadel-Station-13/upstream-merge-33357 
[MIRROR] Prevents (cat)grilles from magically regenerating.
 2017-12-08 19:06:46 +00:00
deathride58
f75b36af75 Merge pull request #4176 from Michiyamenotehifunana/holy-crap-it-took-so-long-to-make-this-armor 
Adds RGB knights and more!
 2017-12-08 18:54:59 +00:00
deathride58
e9932c4f40 Merge pull request #4277 from Citadel-Station-13/upstream-merge-33362 
[MIRROR] Fixes random in random seeds
 2017-12-08 18:53:15 +00:00
deathride58
9715e9c685 Merge pull request #4232 from cebutris/borers 
Removes borer event from rotation
 2017-12-08 18:52:58 +00:00
deathride58
53ab4feb2f Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324 
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 18:47:56 +00:00
deathride58
7cb2337c7f Merge pull request #4266 from Citadel-Station-13/upstream-merge-33345 
[MIRROR] Fixes some broken random events
 2017-12-08 18:47:22 +00:00
deathride58
2275d59305 Merge pull request #4276 from Citadel-Station-13/upstream-merge-33359 
[MIRROR] Fixes air alarm gas thresholds being impossible to change
 2017-12-08 18:46:33 +00:00
deathride58
665cef7a35 Merge pull request #4260 from Citadel-Station-13/upstream-merge-33231 
[MIRROR] Adds pet carriers
 2017-12-08 18:46:07 +00:00
deathride58
e3f5876419 Merge pull request #4275 from Citadel-Station-13/upstream-merge-33329 
[MIRROR] hopefully optimizes process_cell() a touch
 2017-12-08 18:45:17 +00:00
deathride58
6c774d7798 Update mech_fabricator.dm 2017-12-08 13:43:33 -05:00
deathride58
d1490a18ed Update protolathe.dm 2017-12-08 13:42:41 -05:00
deathride58
32cfebfee7 Update circuitprinter.dm 2017-12-08 13:41:26 -05:00
Dax Dupont
513a15f463 Prevents grilles from magically regenerating (#33357) 2017-12-08 12:24:12 -06:00
Jordan Brown
dfaa796fc2 Fixes certain material containers 2017-12-08 12:11:46 -06:00
ACCount
111cb9e5b0 Fixes random in random seeds (#33362) 
* Fixes random in random seeds

* removed kwargs
 2017-12-08 12:09:34 -06:00
ACCount
7aac99d4d7 Fixes air alarm gas thresholds being impossible to change (#33359) 2017-12-08 12:08:24 -06:00
duncathan salt
623a105169 hopefully optimizes process_cell() a touch (#33329) 
* hopeful optimizations + code cleanup to process_cell() and lindaturftile

* minor fixes

* break and right paren

* extraneous define
 2017-12-08 12:07:14 -06:00
Dax Dupont
17bb149cd1 Fixes observer versions of sillicon chat (#33355) 2017-12-08 12:07:01 -06:00
deathride58
33364abc06 Merge pull request #4264 from Citadel-Station-13/upstream-merge-33116 
[MIRROR] Adds a medal for getting to the end of the secret tile dialog.
 2017-12-08 17:31:14 +00:00
deathride58
d379ec8e41 Merge pull request #4265 from Citadel-Station-13/upstream-merge-33343 
[MIRROR] makes cat code better
 2017-12-08 17:30:44 +00:00
deathride58
bc4b689d56 Update medical.dm 2017-12-08 12:23:03 -05:00
deathride58
661b9bf888 Merge pull request #4262 from Citadel-Station-13/upstream-merge-33272 
[MIRROR] Speeds up some list helpers
 2017-12-08 17:19:03 +00:00
deathride58
d826217439 Merge pull request #4261 from Citadel-Station-13/upstream-merge-33235 
[MIRROR] Slime Blueprint Change
 2017-12-08 17:18:22 +00:00
deathride58
17a077e528 Merge pull request #4258 from Citadel-Station-13/upstream-merge-33350 
[MIRROR] panic_address -> panic_server_address
 2017-12-08 17:17:47 +00:00
Jordan Brown
8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen 
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 10:35:23 -06:00
YPOQ
f7d5ab5baf Fixes some broken random events (#33345) 2017-12-08 10:34:50 -06:00
Tlaltecuhtli
309f82dc9e commit (#33343) 
help what is this
 2017-12-08 10:34:42 -06:00
Shadowlight213
0496cc9bc7 Adds a medal for getting to the end of the secret tile dialog. (#33116) 
* Adds medal for reaching the end of the secret room panel list

* fix
 2017-12-08 10:34:35 -06:00
oranges
10d50dd283 Fixes mugs being called "broken bottles" 2017-12-08 10:34:27 -06:00
oranges
ec0f2291c9 Merge pull request #33272 from tgstation/Cyberboss-patch-7 
Speeds up some list helpers
 2017-12-08 10:34:20 -06:00
oranges
d619f206c6 Merge pull request #33235 from Fox-McCloud/xenobio-console 
Slime Blueprint Change
 2017-12-08 10:34:13 -06:00
Ashe Higgs
315e1d718a Adds pet carriers 2017-12-08 10:34:05 -06:00
oranges
c5a61bbca5 Merge pull request #33350 from Cyberboss/FixConfig 
panic_address -> panic_server_address
 2017-12-08 10:33:46 -06:00
AnturK
e1fece081f Limit bullet overlays on walls (#33364) 
* Limit bullet overlays on walls

* Whitespace bad

* Okay

* Touching this because I'm testing TGS3 stuff

* Update walls.dm
 2017-12-08 10:33:39 -06:00
deathride58
e6fb6a5910 Merge pull request #4249 from Citadel-Station-13/upstream-merge-33308 
[MIRROR] Fixes every config flag updating world.sleep_offline
 2017-12-08 00:31:38 +00:00
deathride58
ef9e94a128 Merge pull request #4253 from Citadel-Station-13/upstream-merge-33312 
[MIRROR] old turf in afterShuttleMove
 2017-12-08 00:31:17 +00:00