shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,208 Commits 5 Branches 0 Tags
6fc0cdc67ecb295ff88be10319e6fc2dccc09440
Commit Graph
10208 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub 648d16ec1a Merge pull request #4299 from Citadel-Station-13/upstream-merge-33371 
[MIRROR] Step backwards version of hex2num
 2017-12-10 03:05:36 +00:00
CitadelStationBot fefdde0a36 Automatic changelog generation for PR #4286 [ci skip] 2017-12-09 21:05:24 -06:00
deathride58andGitHub d7cd7b806e Merge pull request #4286 from Citadel-Station-13/upstream-merge-33095 
[MIRROR] Cycle-link airlocks in the mining base
 2017-12-10 03:05:21 +00:00
CitadelStationBot 0d42a65029 Step backwards version of hex2num 2017-12-09 15:54:14 -06:00
Jordan BrownandCitadelStationBot ae48e14876 Merge pull request #33371 from ninjanomnom/walk-backwards-into-hell 
Step backwards version of hex2num
 2017-12-09 15:54:14 -06:00
CitadelStationBot de9b130f0a Fixes spelling error 2017-12-09 15:54:07 -06:00
Jordan BrownandCitadelStationBot 0c93857bc5 Merge pull request #33389 from LuigiBoi/patch-1 
Fixes spelling error
 2017-12-09 15:54:06 -06:00
CitadelStationBot a71c61a97e Allows for qdel in shuttleMove procs 2017-12-09 15:53:57 -06:00
Jordan BrownandCitadelStationBot 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
CitadelStationBot 0df98071ff Fixes emergency lights having infinite power, and replaces their magic number with a define 2017-12-09 15:53:49 -06:00
Jordan BrownandCitadelStationBot 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
CitadelStationBot 0d8af43f8d Remove meaningless "Type too long" message from VV 2017-12-09 15:53:42 -06:00
Jordan BrownandCitadelStationBot 906ed84674 Merge pull request #33386 from AutomaticFrenzy/patch/type-too-long 
Remove meaningless "Type too long" message from VV
 2017-12-09 15:53:42 -06:00
CitadelStationBot db4fdd22c7 cleans up atmos defines 2017-12-09 15:53:34 -06:00
Jordan BrownandCitadelStationBot 7a90baa1f8 Merge pull request #33390 from duncathan/atmos-defines 
cleans up atmos defines
 2017-12-09 15:53:34 -06:00
Jordan BrownandCitadelStationBot 8b41dacba9 switches lobes for grammar n shit 2017-12-09 15:53:27 -06:00
CitadelStationBot f72af85e3f Flickering no longer enables emergency lights 2017-12-09 15:53:20 -06:00
Jordan BrownandCitadelStationBot 7b9bcb37aa Merge pull request #33376 from Xhuis/patch-3 
Flickering no longer enables emergency lights
 2017-12-09 15:53:20 -06:00
CitadelStationBot 6584f859f9 Adds AI Vox Sound Output Circuit 2017-12-09 15:53:12 -06:00
Jordan BrownandCitadelStationBot 3de5ed055f Merge pull request #33365 from KomradeSpectre/vox_circuit 
Adds AI Vox Sound Output Circuit
 2017-12-09 15:53:12 -06:00
CitadelStationBot 2274b74e03 Adds some suicide acts 2017-12-09 15:52:53 -06:00
Jordan BrownandCitadelStationBot 70be12aa1c Merge pull request #33241 from swindly/suicide 
Adds some suicide acts
 2017-12-09 15:52:53 -06:00
LetterJayandGitHub 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
CitadelStationBot be33f9e72e People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off 2017-12-09 15:52:35 -06:00
Jordan BrownandCitadelStationBot 00c17ad6e5 Merge pull request #33263 from kevinz000/patch-402 
People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
 2017-12-09 15:52:35 -06:00
LetterJayandGitHub 99c07951f0 Merge pull request #4282 from Citadel-Station-13/revert-4280-upstream-merge-33098 
Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets."
 2017-12-09 07:25:14 -06:00
XDTMandCitadelStationBot 8502e058b2 Makes godwoken syndrome a bit more reliable 2017-12-09 01:58:18 -06:00
CitadelStationBot 5d8ea96de8 Cycle-link airlocks in the mining base 2017-12-09 01:52:03 -06:00
Tad HardestyandCitadelStationBot 047800c51c Cycle-link airlocks in the mining base (#33095) 2017-12-09 01:52:03 -06:00
CitadelStationBot 6bd60f9981 Add a proc to check if a weather type is affecting an area 2017-12-09 01:36:40 -06:00
orangesandCitadelStationBot 98a0602b1a Add a proc to check if a weather type is affecting an area (#33373) 2017-12-09 01:36:40 -06:00
CitadelStationBot 0bc9c77287 Fixes meth explosions throwing warnings 2017-12-09 01:09:04 -06:00
ACCountandCitadelStationBot 3c9758fe80 Fixes meth explosion throwing warnings (#33356) 2017-12-09 01:09:04 -06:00
CitadelStationBot 4dc06b284c Replace pAI verb tab with an action button 2017-12-08 22:46:30 -06:00
Tad HardestyandCitadelStationBot 0a71554d7f Replace pAI verb tab with an action button (#33358) 
pAI suicide is now standardized with other suicides. The Software
Interface verb has been changed to an action button. This eliminates the
need for a verb tab for only two verbs.
 2017-12-08 22:46:30 -06:00
kevinz000andGitHub 75eab09dff Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets." 2017-12-08 19:16:49 -08:00
deathride58 b8e55b6404 fixes compiling errors 2017-12-08 20:25:55 -05: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
LetterJayandGitHub 99283df12b Merge pull request #4280 from Citadel-Station-13/upstream-merge-33098 
[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets.
 2017-12-08 16:17:25 -06:00
CitadelStationBot d24ae8a05a [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets. 2017-12-08 15:02:18 -06:00
Kyle Spier-SwensonandCitadelStationBot 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub a08586b850 fixes compiling errors 2017-12-08 14:35:30 -05:00
deathride58andGitHub 4600a6eb87 Update drinks.dm 2017-12-08 14:07:33 -05:00
CitadelStationBot d37599a0c5 Automatic changelog generation for PR #4279 [ci skip] 2017-12-08 13:06:49 -06:00
deathride58andGitHub 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
CitadelStationBot f79534045c Automatic changelog generation for PR #4176 [ci skip] 2017-12-08 12:55:02 -06:00
deathride58andGitHub 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
deathride58andGitHub 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