cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,275 Commits 55 Branches 0 Tags
edea89c8fe969a913cb21a8c491f481da3e30755
Commit Graph

7522 Commits

Author SHA1 Message Date
vuonojenmustaturska
edea89c8fe You can taste oil (#34046) 2018-01-03 15:06:54 -06:00
deathride58
94eeb5981d Merge pull request #4646 from Citadel-Station-13/upstream-merge-34031 
[MIRROR] Prevents Nar-Sie from being double-summoned
 2018-01-03 18:56:31 +00:00
deathride58
f39253a0cc Merge pull request #4645 from Citadel-Station-13/upstream-merge-34023 
[MIRROR] Less is more - Nerfs explosion camera shake
 2018-01-03 18:56:17 +00:00
deathride58
b09086022d Merge pull request #4644 from Citadel-Station-13/upstream-merge-34040 
[MIRROR] Fixes marauder ghostclick jump
 2018-01-03 18:54:36 +00:00
deathride58
6dc4584401 Merge pull request #4643 from Citadel-Station-13/upstream-merge-34033 
[MIRROR] Fix mimes being able to laugh audibly
 2018-01-03 18:54:12 +00:00
deathride58
64b5feae78 Merge pull request #4642 from Citadel-Station-13/upstream-merge-34038 
[MIRROR] Fixes text pad window title
 2018-01-03 18:53:51 +00:00
Jordan Brown
1d235c0a72 Merge pull request #34031 from ShizCalev/narsie-summons 
Prevents Nar-Sie from being double-summoned
 2018-01-03 12:25:35 -06:00
Jordan Brown
3516c837d9 Merge pull request #34023 from deathride58/LESSISMOREHOLYFUCK 
Less is more - Nerfs explosion camera shake
 2018-01-03 11:59:55 -06:00
Jordan Brown
a642a1c298 Merge pull request #34040 from AnturK/maraudercheck 
Fixes marauder ghostclick jump
 2018-01-03 11:58:42 -06:00
Leo
c1623792c9 Merge pull request #34033 from AutomaticFrenzy/patch/mime-laugh 
Fix mimes being able to laugh audibly
 2018-01-03 07:36:43 -06:00
Leo
832b1d95df Merge pull request #34038 from ShizCalev/text-pad 
Fixes text pad window title
 2018-01-03 07:35:17 -06:00
ShizCalev
c41bf82380 Fixes observers not being transfered to new mobs (#34039) 2018-01-03 07:33:53 -06:00
LetterJay
b6a8902e01 Merge pull request #4639 from Citadel-Station-13/upstream-merge-34032 
[MIRROR] Unsquishes job ban panel
 2018-01-03 04:57:12 -06:00
LetterJay
6d1095a3cb Merge pull request #4603 from Citadel-Station-13/upstream-merge-33917 
[MIRROR] Always use the area name when selecting a teleport beacon
 2018-01-03 04:56:55 -06:00
LetterJay
ae8ae2969c Merge pull request #4426 from Citadel-Station-13/upstream-merge-33601 
[MIRROR] Fixes cross comms
 2018-01-03 04:56:38 -06:00
Dax Dupont
417e3d801e Unsquishes job ban panel 2018-01-02 20:10:30 -06:00
LetterJay
d8806cacc7 Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967 
[MIRROR] Makes the decal component handle updating inventory icons
 2018-01-02 19:15:46 -06:00
LetterJay
fc4e56201c Merge pull request #4637 from Citadel-Station-13/upstream-merge-33986 
[MIRROR] Makes some virology symptoms more worth using
 2018-01-02 19:15:22 -06:00
LetterJay
3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -06:00
LetterJay
706556df69 Merge pull request #4601 from Citadel-Station-13/upstream-merge-33919 
[MIRROR] turfs changed to /space/basic are instead turned into /space
 2018-01-02 18:13:42 -06:00
LetterJay
4dcc65a6bc Merge branch 'master' into upstream-merge-33917 2018-01-02 17:14:53 -06:00
LetterJay
590775ddbe Merge pull request #4635 from Citadel-Station-13/upstream-merge-34003 
[MIRROR] Fixes Abyssal Gaze blinding forever
 2018-01-02 17:13:31 -06:00
LetterJay
c22e0dc862 Update chameleon.dm 2018-01-02 15:48:32 -06:00
LetterJay
36cbe323cd Update vision.dm 2018-01-02 15:48:09 -06:00
LetterJay
2720b29908 Update sensory.dm 2018-01-02 15:47:56 -06:00
LetterJay
6b1f18d60c Merge pull request #4636 from Citadel-Station-13/upstream-merge-34021 
[MIRROR] Fixes ocky icky in the bank vault
 2018-01-02 15:47:01 -06:00
LetterJay
4adbd0fbf4 Update construct_spells.dm 2018-01-02 15:46:51 -06:00
LetterJay
c914f14339 Merge pull request #4634 from Citadel-Station-13/upstream-merge-33985 
[MIRROR] Solar control fixes
 2018-01-02 15:46:35 -06:00
LetterJay
b80c0c08ba Merge pull request #4621 from Citadel-Station-13/upstream-merge-33948 
[MIRROR] stops frying abstract or nodrop items
 2018-01-02 15:44:26 -06:00
Emmett Gaines
f581b2d94d Makes the decal component handle updating inventory icons 2018-01-02 15:18:31 -06:00
XDTM
84e0f7b7f3 Makes some virology symptoms more worth using 2018-01-02 15:15:17 -06:00
LetterJay
dcca57808b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/game/gamemodes/blob/overmind.dm
 2018-01-02 14:58:09 -06:00
LetterJay
943388d8f4 Merge pull request #4367 from Citadel-Station-13/upstream-merge-33463 
[MIRROR] Adds blob roundend report.
 2018-01-02 14:56:12 -06:00
Dax Dupont
6c606654c3 Removes icky ocky from the vault (#34021) 2018-01-02 13:31:28 -06:00
XDTM
bae882bf46 Fixes Abyssal Gaze blinding forever 2018-01-02 08:22:32 -06:00
Dax Dupont
0ebd16f509 Solar control fixes (#33985) 
* Solar fixes

* Also removing the solcon-o icon
 2018-01-02 08:21:16 -06:00
LetterJay
b3eb85cdd2 Merge pull request #4633 from Citadel-Station-13/upstream-merge-34035 
[MIRROR] Puts back the changeturf part of PlaceOnTop()
 2018-01-02 08:02:02 -06:00
LetterJay
d035f16aca Update basilisk.dm 2018-01-02 05:24:47 -06:00
LetterJay
f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2018-01-02 05:16:13 -06:00
LetterJay
b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 
[MIRROR] removes silly garbage defines
 2018-01-02 04:52:57 -06:00
LetterJay
f786a90bad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 
# Conflicts:
#	code/controllers/subsystem/idlenpcpool.dm
 2018-01-02 04:37:36 -06:00
LetterJay
c9482653f1 Merge pull request #4395 from Citadel-Station-13/upstream-merge-33537 
[MIRROR] Defines all subsystem priority values
 2018-01-02 04:21:05 -06:00
oranges
18f5e1095a Merge pull request #34035 from ninjanomnom/actually-changeturf 
Puts back the changeturf part of PlaceOnTop()
 2018-01-02 00:12:32 -06:00
LetterJay
9ede14fbce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 2018-01-01 14:14:06 -06:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay
3ee2569379 Update borer_event.dm 2018-01-01 14:07:17 -06:00
LetterJay
ea3652c30e fuk 2018-01-01 11:07:40 -06:00
LetterJay
c2b23984ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33660 2018-01-01 10:59:13 -06:00
LetterJay
5486f71010 woo 2018-01-01 07:30:50 -06:00
LetterJay
168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00