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

3941 Commits

Author SHA1 Message Date
deathride58 32c63c2e70 Merge pull request #6831 from Citadel-Station-13/upstream-merge-37961 
[MIRROR] Enable admin AI interaction for firelocks
 2018-05-22 02:27:39 +00:00
deathride58 c376ef6268 Merge pull request #6833 from Citadel-Station-13/upstream-merge-37956 
[MIRROR] Cleans up duplicate get_area's in c.grenade priming
 2018-05-22 02:27:01 +00:00
deathride58 3d9af22c4c Merge pull request #6834 from Citadel-Station-13/upstream-merge-37906 
[MIRROR] Removes firing-pins box in RD's locker
 2018-05-22 02:26:39 +00:00
deathride58 56dbd7c980 Merge pull request #6838 from Citadel-Station-13/upstream-merge-37974 
[MIRROR] Fix glowshrooms missing their icon in the editor
 2018-05-22 02:25:34 +00:00
oranges 3fd74027c1 Merge pull request #37945 from AutomaticFrenzy/patch/hydroponics-trays 
Fix construction behavior of hydroponics trays
 2018-05-21 16:58:31 -05:00
Jordan Brown 638c2eb81d Merge pull request #37974 from AutomaticFrenzy/patch/glowshroom-icon 
Fix glowshrooms missing their icon in the editor
 2018-05-21 16:44:52 -05:00
Wilchenx 85ef262082 Removes firing-pins box in RD's locker (#37906) 
Makes no sense since science can't print any guns and probably won't ever be able to again.
 2018-05-21 16:36:04 -05:00
Jordan Brown 0d08eca330 Merge pull request #37956 from ShizCalev/chem-grenade-cleanup 
Cleans up duplicate get_area's in c.grenade priming
 2018-05-21 16:35:54 -05:00
Jordan Brown a3c3052f25 Merge pull request #37961 from AutomaticFrenzy/patch/ai-firelock 
Enable admin AI interaction for firelocks
 2018-05-21 16:32:32 -05:00
LetterJay 6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476 
[MIRROR] Uppercases slot defines.
 2018-05-21 11:23:02 -05:00
LetterJay 32cf8e6eb2 Merge pull request #6812 from Citadel-Station-13/upstream-merge-37928 
[MIRROR] Comms consoles don't update while viewing messages
 2018-05-21 08:30:19 -05:00
LetterJay 207c022f87 Merge pull request #6825 from Citadel-Station-13/upstream-merge-37954 
[MIRROR] Refresh mob views when atoms enter/exit storage
 2018-05-21 08:29:46 -05:00
Tad Hardesty 9b4b9b4f34 Refresh mob views when atoms enter/exit storage (#37954) 2018-05-21 04:46:20 -05:00
Nich 177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
LetterJay 0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
LetterJay 1e207a7430 modular_citadel 2018-05-20 23:04:13 -05:00
CitadelStationBot 845938bc73 [MIRROR] disables the chameleon gun from use (#6813) 
* crashing the server with no survivors

* disables the chameleon gun from use
 2018-05-20 20:42:02 -07:00
Jordan Brown 2fb886065b Merge pull request #37928 from nichlas0010/fixescommsconsoleupdates 
Comms consoles don't update while viewing messages
 2018-05-20 19:38:01 -05:00
ShizCalev 49bf67ed1d Updates BYOND links to use HTTPS (#37918) 
* Updates BYOND links to use HTTPS

* revert

* if -> If
 2018-05-20 15:31:28 -05:00
iksyp aae6ea0203 [READY] Gives Stacking Machines and their consoles machine boards (#37607) 
* patch-2

* does everything on the TODO list

FUCK YEAH
*breaks up the engineering node design ID's for readability
*linking the device via multitool is possible
*The machinery construction "recipes" are less shit and make a bit more sense

* coil

* did somebody say RUNTIMES?

*fixed runtimes when there is no link on the stacking machine console
*added feedback for unlinked consoles
*it's -> its
*proper typecheck

* achieved with [src]
 2018-05-19 16:39:45 -05:00
LetterJay 0714d25f57 Merge pull request #6801 from Citadel-Station-13/upstream-merge-37881 
[MIRROR] Fixes mindswap book runtime
 2018-05-19 09:15:16 -05:00
LetterJay 86f69e2947 Merge pull request #6796 from Citadel-Station-13/upstream-merge-37890 
[MIRROR] [Ready] Adds "proper" solar/gold/silver crates
 2018-05-19 09:13:58 -05:00
LetterJay f5a53c32af Merge pull request #6793 from Citadel-Station-13/upstream-merge-37908 
[MIRROR] Removes the ability for RD's to steal hand teles
 2018-05-19 09:13:08 -05:00
ShizCalev 4e4e07e8bb Fixes mindswap book runtime (#37881) 2018-05-19 05:32:45 -05:00
81Denton 5ed28b5cd2 Adds "proper" solar/gold/silver crates (#37890) 
* adds solar/gold/silver crates

* replaces pubbystation crates

* hhhh

* forgot adding spaces

* travis pls
 2018-05-19 02:14:00 -05:00
Nich ed556b2c0e Removes the ability for RD's to steal hand teles (#37908) 2018-05-18 19:51:06 -05:00
81Denton 8235db8b5c this violates the space geneva convention (#37903) 2018-05-18 16:46:05 -05:00
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