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

1328 Commits

Author SHA1 Message Date
LetterJay
cfe5c7a962 Merge pull request #6895 from Citadel-Station-13/upstream-merge-38023 
[MIRROR] Fix various bugs with telekinesis
 2018-05-25 23:28:01 -05:00
Jordan Brown
e582e7019e Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay 
Fix various bugs with telekinesis
 2018-05-25 10:49:21 -05:00
vuonojenmustaturska
1d1dc1aca8 Disallow effects from being scanned by the chameleon projector (#38017) 
* henk

* iseffect
 2018-05-25 07:38:01 -05: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
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
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -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
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
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
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
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
Tad Hardesty
9b4b9b4f34 Refresh mob views when atoms enter/exit storage (#37954) 2018-05-21 04:46:20 -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
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
ShizCalev
4e4e07e8bb Fixes mindswap book runtime (#37881) 2018-05-19 05:32:45 -05:00
81Denton
8235db8b5c this violates the space geneva convention (#37903) 2018-05-18 16:46:05 -05: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
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
81Denton
0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -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
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
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
CitadelStationBot
ccaddb17e2 Update wallets.dm 2018-05-13 20:59:02 -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
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
CitadelStationBot
ff8e5e92bf Update medical.dm 2018-05-13 12:01:55 -05:00
LetterJay
884b8b8c4d Update smokebomb.dm 2018-05-13 11:54:34 -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
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