shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,005 Commits 5 Branches 0 Tags
edce62494de0b0060328aec6763967ead7b43af1
Commit Graph

10005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
LetterJay
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
kevinz000
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
LetterJay
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-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
a08586b850 fixes compiling errors 2017-12-08 14:35:30 -05:00
deathride58
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
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
CitadelStationBot
f79534045c Automatic changelog generation for PR #4176 [ci skip] 2017-12-08 12:55:02 -06: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
CitadelStationBot
3a445a0785 Automatic changelog generation for PR #4270 [ci skip] 2017-12-08 12:47:58 -06: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
CitadelStationBot
bca8dd78f1 Automatic changelog generation for PR #4266 [ci skip] 2017-12-08 12:47:24 -06: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
CitadelStationBot
19a54d3289 Automatic changelog generation for PR #4267 [ci skip] 2017-12-08 12:47:02 -06:00
deathride58
15e245f9dc Merge pull request #4267 from Citadel-Station-13/upstream-merge-33344 
[MIRROR] Improves the Smoke Machine sprite
 2017-12-08 18:46:59 +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
CitadelStationBot
7c1eca23b9 Automatic changelog generation for PR #4260 [ci skip] 2017-12-08 12:46:10 -06: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
08824d890f Merge pull request #4268 from Citadel-Station-13/upstream-merge-33336 
[MIRROR] Adds a MapAtmosFixer auto compile thing to .gitignore
 2017-12-08 18:45:39 +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
CitadelStationBot
aae7c6f5c9 Automatic changelog generation for PR #4274 [ci skip] 2017-12-08 12:44:36 -06:00
deathride58
b62c817779 Merge pull request #4274 from Citadel-Station-13/upstream-merge-33355 
[MIRROR] Fixes observer flavor of silicon chat
 2017-12-08 18:44:34 +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
CitadelStationBot
cf2fb9748e Prevents (cat)grilles from magically regenerating. 2017-12-08 12:24:12 -06: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
CitadelStationBot
735c2c6edb Fixes random in random seeds 2017-12-08 12:09:34 -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
CitadelStationBot
af66b496b2 Fixes air alarm gas thresholds being impossible to change 2017-12-08 12:08:24 -06:00
ACCount
7aac99d4d7 Fixes air alarm gas thresholds being impossible to change (#33359) 2017-12-08 12:08:24 -06:00
CitadelStationBot
b722040d3d hopefully optimizes process_cell() a touch 2017-12-08 12:07:14 -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
CitadelStationBot
82c90df425 Fixes observer flavor of silicon chat 2017-12-08 12:07:01 -06:00
Dax Dupont
17bb149cd1 Fixes observer versions of sillicon chat (#33355) 2017-12-08 12:07:01 -06:00
CitadelStationBot
8961c8c369 Automatic changelog generation for PR #4264 [ci skip] 2017-12-08 11:31:17 -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