shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,699 Commits 5 Branches 0 Tags
bfcaceb4e182f82fec5a4b1df65a52ccbfd5ced5
Commit Graph

3907 Commits

Author SHA1 Message Date
Jordan Brown
a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox 
Query debug logging
 2018-05-17 21:38:41 -05:00
deathride58
649314c455 Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429 
[MIRROR] Update DMAPI to version 3.2.1.0
 2018-05-17 18:14:54 +00:00
deathride58
986ea603e9 Merge pull request #6686 from Citadel-Station-13/upstream-merge-37719 
[MIRROR] [s] Fix wallets acting as though they still contain removed IDs
 2018-05-17 18:13:28 +00:00
deathride58
146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423 
[MIRROR] [s] Hallucinations 4.0
 2018-05-17 18:12:57 +00:00
deathride58
290a4ef1de Merge pull request #6757 from Citadel-Station-13/upstream-merge-37850 
[MIRROR] Fixes fireaxe butchering.
 2018-05-17 18:12:33 +00:00
deathride58
97b72c0289 Merge pull request #6758 from Citadel-Station-13/upstream-merge-37853 
[MIRROR] Fixes wrong circuits
 2018-05-17 18:12:16 +00:00
deathride58
baec90fe11 Merge pull request #6759 from Citadel-Station-13/upstream-merge-37840 
[MIRROR] Fixes meteors hitting qdeleted stuff.
 2018-05-17 18:11:57 +00:00
deathride58
cee67a7706 Merge pull request #6760 from Citadel-Station-13/upstream-merge-37602 
[MIRROR] [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping
 2018-05-17 18:11:24 +00:00
deathride58
583de894f3 Merge pull request #6763 from Citadel-Station-13/upstream-merge-37863 
[MIRROR] Fixes changeling team objectives (a bit)
 2018-05-17 18:10:01 +00:00
ShizCalev
0e819cb1fc Fixes container_resist runtimes (#37888) 2018-05-17 10:57:48 -05:00
vuonojenmustaturska
aa7a27420c Merge pull request #37863 from AnturK/rr4 
Fixes changeling team objectives (a bit)
 2018-05-16 14:35:49 -05:00
81Denton
0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -05:00
LetterJay
8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00
AnturK
b111088140 Fixes meteors hitting qdeleted stuff. (#37840) 
* Fixes meteors hitting qdeleted stuff.

* I made a typo in one line change, time to die.

* Better solution ?
 2018-05-16 12:06:06 -05:00
Dax Dupont
eb29d86c5f Fixes wrong circuits (#37853) 
* Fixes wrong circuits

* this too
 2018-05-16 12:04:54 -05:00
AnturK
593919a85a Fixes fireaxe butchering. (#37850) 2018-05-16 12:04:45 -05:00
deathride58
4d3ead744a Update wallets.dm 2018-05-16 12:15:29 -04:00
vuonojenmustaturska
5e48fcd275 Merge pull request #37846 from DaxDupont/axe-time 
Small cult nerf do not be alarmed robustin think about your heart
 2018-05-16 04:46:59 -05:00
LetterJay
ce98f9c444 Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785 
[MIRROR] Replaces loose tech storage boards with spawners
 2018-05-15 06:53:25 -05:00
LetterJay
f86af0ab41 Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818 
[MIRROR] Fix some missing icons
 2018-05-15 06:52:32 -05:00
LetterJay
0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646 
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
 2018-05-15 00:47:59 -05:00
Jordan Brown
3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
Jordan Brown
7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons 
Fix some missing icons
 2018-05-14 15:13:33 -05:00
LetterJay
f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760 
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
 2018-05-14 12:28:41 -05:00
LetterJay
c92a18f733 Update syndicate.dm 2018-05-13 22:07:01 -05:00
CitadelStationBot
ccaddb17e2 Update wallets.dm 2018-05-13 20:59:02 -05:00
CitadelStationBot
8b5c2d3108 Merge pull request #6739 from Citadel-Station-13/upstream-merge-37525 
[MIRROR] Replaces adding goliath plates to clothing and APLUs with a customizable tracking component
 2018-05-13 20:38:49 -05:00
CitadelStationBot
3e090c4537 Merge pull request #6735 from Citadel-Station-13/upstream-merge-37816 
[MIRROR] Fixes bike horn attack
 2018-05-13 18:58:40 -05:00
CitadelStationBot
c4a46ae194 Merge pull request #6734 from Citadel-Station-13/upstream-merge-37809 
[MIRROR] Adds security jumpskirts this time with less broken github
 2018-05-13 18:58:10 -05:00
Barhandar
bcd2b0a3b0 Replaces adding goliath plates to clothing and APLUs with a customizable tracking component (#37525) 
add: Amount of goliath plates is now shown in examine for explorer suits and mining hardsuits.


I was peeved by being unable to tell whether the armour is upgraded or not except by trying to stick more plates on it.

I think a more correct way would be to add a plate amount var to these items similarly to APLU plating and then have description mention their amount and, for added transparency, that it's possible to improve it if there's 0 plates.

Please point the errors/wrongs in it, since "current armour value minus constant divided by value each plate adds" is rather clunky code.
 2018-05-13 18:55:56 -05:00
CitadelStationBot
e089a8254f Merge pull request #6725 from Citadel-Station-13/upstream-merge-37731 
[MIRROR] Makes gauze deconstructable into cloth
 2018-05-13 12:19:50 -05:00
vuonojenmustaturska
9d4fe1d85c Merge pull request #37816 from YPOQ/bikehornfix 
Fixes bike horn attack
 2018-05-13 12:12:17 -05:00
vuonojenmustaturska
998e49da06 Merge pull request #37809 from Qbopper/secskirts 
Adds security jumpskirts this time with less broken github
 2018-05-13 12:11:02 -05:00
CitadelStationBot
ff8e5e92bf Update medical.dm 2018-05-13 12:01:55 -05:00
LetterJay
ca86c93e70 Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406 
[MIRROR] Adds (fake) ambient occlusion as a client preference
 2018-05-13 11:52:23 -05:00
LetterJay
28947e1c89 Merge pull request #6729 from Citadel-Station-13/upstream-merge-37792 
[MIRROR] Fixes defibs/backpack watertanks/gatling lasers
 2018-05-13 10:14:07 -05:00
LetterJay
cf28aee1ee Merge pull request #6728 from Citadel-Station-13/upstream-merge-37464 
[MIRROR] Adds plasma rein glass to the ORM & adjusts material values on the various glass sheets.
 2018-05-13 10:12:28 -05:00
YPOQ
23f6567872 Fixes defibs/watertanks/gatling lasers (#37792) 2018-05-13 06:13:45 -05:00
FrozenGuy5
e9ef82513c Add plasma rein glass to the ORM & adjusts material values on the various glass sheets (#37464) 
* Update smelting_designs.dm

* Tweaks material values on titanium glass.

* Optimizes math & fixes errors and inconsistencies
 2018-05-13 06:13:36 -05:00
XDTM
5847268db3 Linked teleporters now teleport to the hub instead of the power station (#37684) 2018-05-13 06:13:27 -05:00
LetterJay
156b0529e1 Merge pull request #6722 from Citadel-Station-13/upstream-merge-37797 
[MIRROR] Adds desc to chemmaster circ board
 2018-05-13 03:30:26 -05:00
LetterJay
65fd97000c Merge pull request #6719 from Citadel-Station-13/upstream-merge-37707 
[MIRROR] Fixes large crates (Issue #36516)
 2018-05-13 03:29:21 -05:00
LetterJay
ee9e96106e Merge pull request #6717 from Citadel-Station-13/upstream-merge-37742 
[MIRROR] spellig fix
 2018-05-13 03:28:39 -05:00
LetterJay
80aad142a4 Merge branch 'master' into upstream-merge-37406 2018-05-13 03:28:37 -05:00
LetterJay
cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558 
[MIRROR] Anomaly Armour Research
 2018-05-12 21:36:51 -05:00
Mickyan
b11e600cff Makes gauze deconstructable into cloth 2018-05-12 19:15:32 -05:00
81Denton
11d63f6a56 Adds desc to chemmaster circ board (#37797) 
* adds desc to chemmaster circ board

* ASS♂WE♂CAN♂

* don't drink and web edit kids
 2018-05-12 17:49:29 -05:00
LetterJay
f21cac1af2 Merge pull request #6700 from Citadel-Station-13/upstream-merge-37399 
[MIRROR] Use spritesheets to reduce time spent sending PNG assets by 90+%
 2018-05-12 17:04:23 -05:00
Alexch2
b0b9240466 Fixes large crates acting like lockers (#37707) 
* Fixes large crates acting like lockers

* removes forgotten comment

* Adds Cobby's suggestions, and makes the description more useful. Also improves feedback when using the wrong tool.
 2018-05-12 16:41:54 -05:00
Armhulen
56eab7e394 Fix spelling in mime forcefield description (#37742) 
* SPELL IT RIGHT REEEEEEEEEEEEEEEEE

* Awhile
 2018-05-11 17:30:58 -05:00