shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,032 Commits 5 Branches 0 Tags
f2fdbab0cb22749ca4e0161dec649657499cf613
Commit Graph

3979 Commits

Author SHA1 Message Date
LetterJay
273e2aa13d Merge pull request #6865 from Citadel-Station-13/upstream-merge-38000 
[MIRROR] Removes a couple thousand empty lists
 2018-05-25 02:37:18 -05:00
LetterJay
2908431bac Merge pull request #6857 from Citadel-Station-13/upstream-merge-37951 
[MIRROR] adds logging to mayhem bottle and blood frenzy
 2018-05-25 02:35:43 -05:00
LetterJay
b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
 2018-05-24 11:58:57 -05:00
vuonojenmustaturska
36b3cbe4bf Removes a couple thousand empty lists (#38000) 
door.shockedby
 2018-05-23 21:15:41 -05:00
deathride58
fc4debd4ca makes small tweaks to the hub entry (#6782) 2018-05-23 12:12:57 -07:00
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJay
130db93543 Merge pull request #6859 from Citadel-Station-13/upstream-merge-37982 
[MIRROR] Fix flipping of trinary pipe fittings and related RPD tooltips
 2018-05-23 06:49:44 -05:00
LetterJay
dcaebec121 Merge pull request #6856 from Citadel-Station-13/upstream-merge-37962 
[MIRROR] Fixes gulag teleporter runtime, now automatically sets the default goal of an ID
 2018-05-23 06:46:02 -05:00
Tad Hardesty
782c893cf4 Fix flipping of trinary pipe fittings and related RPD tooltips (#37982) 2018-05-23 06:33:07 -05:00
LetterJay
990d997482 Update radio.dm 2018-05-23 05:41:41 -05:00
LetterJay
e7d9cd0698 Merge branch 'master' into upstream-merge-37597 2018-05-23 05:21:19 -05:00
imsxz
5016ea6186 Add logging to mayhem bottle and blood frenzy (#37951) 
* who the fuck didnt make this logged ages ago jesus fucking christ

* who fucking coded this garbage why isnt it a status effect

* Update mines.dm

* reeeeeeeee

* reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
 2018-05-23 01:41:33 -05:00
ShizCalev
bb2f79ed7b Fixes gulag teleporter runtime (#37962) 2018-05-23 01:41:24 -05:00
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
63aa6eeee6 Update lava.dm 2018-05-22 07:58:44 -05:00
LetterJay
e7a3f6e128 Update reverse_bear_trap.dm 2018-05-22 07:56:52 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJay
adf1505c70 Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486 
[MIRROR] Moves several clothing-specific flags from /atom to their proper type
 2018-05-22 07:18:34 -05:00
LetterJay
01fc8cf128 Merge pull request #6555 from Citadel-Station-13/upstream-merge-37293 
[MIRROR] Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again
 2018-05-22 07:17:41 -05:00
deathride58
d0297e326d Merge pull request #6827 from Citadel-Station-13/upstream-merge-37957 
[MIRROR] Fixes defibillator runtime
 2018-05-22 02:29:19 +00:00
deathride58
2c73811b1f Merge pull request #6829 from Citadel-Station-13/upstream-merge-37955 
[MIRROR] Keep only the most recent airlock autoclose timer
 2018-05-22 02:28:21 +00:00
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
Jordan Brown
9095d48215 Merge pull request #37955 from AutomaticFrenzy/patch/airlock-autoclose 
Keep only the most recent airlock autoclose timer
 2018-05-21 16:29:09 -05:00
ShizCalev
5964fa0712 Fixes defibillator runtime 2018-05-21 14:54:46 -05:00
LetterJay
359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -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
931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJay
39365437f5 Merge branch 'master' into upstream-merge-37293 2018-05-21 08:53:17 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -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
kevinz000
d54667c81b [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT 2018-05-19 18:51:51 -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