shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,412 Commits 5 Branches 0 Tags
dfd5c7465bbb8a166f3bf335d7dec98f8c4bb93b
Commit Graph

3156 Commits

Author SHA1 Message Date
LetterJay
2719f23e52 Update shieldgen.dm 2017-08-14 18:53:01 -05:00
LetterJay
98ff124b68 Update shieldgen.dm 2017-08-14 18:50:44 -05:00
LetterJay
e90adf63fe Merge branch 'master' into upstream-merge-29606 2017-08-14 18:48:42 -05:00
LetterJay
6d62d51eab Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288 
[MIRROR] Hallucinations 3.0
 2017-08-14 18:45:45 -05:00
LetterJay
ce918273bc Merge pull request #2313 from Citadel-Station-13/upstream-merge-29779 
[MIRROR] Fixes the Hierophant not spawning its crusher trophy
 2017-08-14 18:45:28 -05:00
LetterJay
9b57f5fd62 Update collectable.dm 2017-08-14 18:39:22 -05:00
LetterJay
46c6a54a75 Update misc.dm 2017-08-14 18:38:55 -05:00
LetterJay
300fc768a5 Merge pull request #2265 from Citadel-Station-13/upstream-merge-29727 
[MIRROR] The inhands of the Dark Blessing chaplain weapon is now visible.
 2017-08-14 18:37:28 -05:00
LetterJay
1bb5e19596 Merge pull request #2255 from Citadel-Station-13/upstream-merge-29695 
[MIRROR] flora.dm initialize hint
 2017-08-14 18:36:58 -05:00
LetterJay
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
Haresay
048c782156 xenomorph update 
A long overdue overhall and readdition of xenos
 2017-08-14 17:09:11 -06:00
CitadelStationBot
97243fca3a Moved can_trigger_gun to item/weapon parent 2017-08-14 16:05:43 -05:00
CitadelStationBot
5fd3a8355c Fixes the Resurrect Cultist rune not working 2017-08-14 16:05:33 -05:00
LetterJay
f088e812a9 Update flora.dm 2017-08-14 09:31:49 -05:00
LetterJay
fa8ed2de17 Update component.dm 2017-08-14 09:13:33 -05:00
CitadelStationBot
7faec45053 Tiny bit better splitting on add_details 2017-08-14 09:07:03 -05:00
LetterJay
f1872a8bae Merge pull request #2231 from Citadel-Station-13/upstream-merge-29615 
[MIRROR] Action buttons for spells now include their description
 2017-08-14 08:56:19 -05:00
LetterJay
822cddc718 Update Hallucination.dm 2017-08-14 08:55:45 -05:00
LetterJay
281ed6cb79 Merge pull request #2146 from Citadel-Station-13/upstream-merge-29464 
[MIRROR] Adds info about schema versioning to head of db changelog file
 2017-08-14 08:31:46 -05:00
LetterJay
bfbc3e198c Merge branch 'master' into upstream-merge-29523 2017-08-14 08:30:40 -05:00
LetterJay
f52d120caf Update world.dm 2017-08-14 08:27:50 -05:00
LetterJay
80bb075eb3 Update Hallucination.dm.rej 2017-08-14 08:24:58 -05:00
LetterJay
fdfdd4fc21 Update admin_investigate.dm 2017-08-14 08:24:34 -05:00
LetterJay
4edf9880d6 Update logging.dm 2017-08-14 08:23:46 -05:00
LetterJay
cb861b28ca Merge pull request #2367 from Citadel-Station-13/upstream-merge-29841 
[MIRROR] Makes the ahelp topic give the permissions warning
 2017-08-14 08:21:38 -05:00
LetterJay
123454c45a Merge pull request #2366 from Citadel-Station-13/upstream-merge-29846 
[MIRROR] Makes mulligan antag check for gamemode required players
 2017-08-14 08:21:24 -05:00
LetterJay
7c6f9c4973 Merge pull request #2363 from Citadel-Station-13/upstream-merge-29867 
[MIRROR] Tweaks atmos canister lights.
 2017-08-14 08:20:57 -05:00
LetterJay
76da67e316 Merge pull request #2360 from Citadel-Station-13/upstream-merge-29828 
[MIRROR] Fixes turf slipping
 2017-08-14 08:20:27 -05:00
CitadelStationBot
2476d59be6 Makes the ahelp topic give the permissions warning 2017-08-14 06:54:44 -05:00
CitadelStationBot
e986657b16 Makes mulligan antag check for gamemode required players 2017-08-14 06:25:03 -05:00
CitadelStationBot
f840a18a9a Fix compile warning 2017-08-14 02:59:42 -05:00
CitadelStationBot
7fe8dd208d [s] Clean up some inputs 2017-08-14 02:44:24 -05:00
CitadelStationBot
726ffe1fdd Tweaks atmos canister lights. 2017-08-14 01:25:02 -05:00
CitadelStationBot
7aa960b499 Fixes a typo in the blobbernaut spawn text 2017-08-14 01:23:57 -05:00
CitadelStationBot
16428315aa Merges the two turf/Entereds 2017-08-13 18:01:40 -05:00
CitadelStationBot
e354c9f289 Fixes turf slipping 2017-08-13 18:00:36 -05:00
CitadelStationBot
0e7b9a008e Ports a slightly edited version of Eris APC sprites 2017-08-13 17:54:27 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
LetterJay
64da23febb Merge pull request #2356 from Citadel-Station-13/upstream-merge-29840 
[MIRROR] Adds icon_states to the unused and used Eldritch whetstones
 2017-08-13 09:53:11 -05:00
LetterJay
3876ecab9e Merge pull request #2354 from Citadel-Station-13/upstream-merge-29853 
[MIRROR] critical priority roleplay grammatical patch (*surrender emote fix)
 2017-08-13 09:52:46 -05:00
LetterJay
248d151b90 Merge pull request #2351 from Citadel-Station-13/upstream-merge-29861 
[MIRROR] Fix fireaxe cabinets spawned with broken icons
 2017-08-13 09:52:14 -05:00
LetterJay
d3e8815788 Merge pull request #2350 from Citadel-Station-13/upstream-merge-29864 
[MIRROR] Fixes minebots missing action icons
 2017-08-13 09:51:45 -05:00
LetterJay
81dc5d2c09 Merge pull request #2349 from Citadel-Station-13/upstream-merge-29826 
[MIRROR] get_head_slots() now returns wear_neck
 2017-08-13 09:51:29 -05:00
LetterJay
47eb2e528f Merge pull request #2348 from Citadel-Station-13/upstream-merge-29843 
[MIRROR] Adds callback select system
 2017-08-13 09:51:17 -05:00
LetterJay
fdfb61b527 Update client_procs.dm 2017-08-13 09:50:51 -05:00
CitadelStationBot
1e3ea07d8b Adds icon_states to the unused and used Eldritch whetstones 2017-08-13 01:28:24 -05:00
CitadelStationBot
deffc1b1f1 More baseturf helpers 2017-08-13 01:28:20 -05:00
CitadelStationBot
dae3e121f2 critical priority roleplay grammatical patch (*surrender emote fix) 2017-08-13 01:28:16 -05:00
CitadelStationBot
7004797c8c Fixed sign description 2017-08-13 01:28:08 -05:00
CitadelStationBot
80f1fb8c58 Fix fireaxe cabinets spawned with broken icons 2017-08-13 01:28:03 -05:00