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 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,013 Commits 55 Branches 0 Tags
0418ee4df64e0179306fc56a350e5075317769d0
Commit Graph

7362 Commits

Author SHA1 Message Date
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay
a56882556b Update _eminence.dm 2017-12-29 07:36:03 -06:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJay
6d52395643 Merge pull request #4587 from Citadel-Station-13/upstream-merge-33899 
[MIRROR] Fixes air alarm contaminated mode
 2017-12-29 06:48:09 -06:00
LetterJay
e17f9fdc07 Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895 
[MIRROR] Corrects abductor uncuffing message
 2017-12-29 06:47:56 -06:00
LetterJay
464edc7699 Merge pull request #4585 from Citadel-Station-13/upstream-merge-33896 
[MIRROR] Fixes apple/banana/potato juicing
 2017-12-29 06:30:04 -06:00
LetterJay
0bfd05e668 Merge pull request #4584 from Citadel-Station-13/upstream-merge-33857 
[MIRROR] Increases research point income by 33% (APPROVED BY KORPHAERON)
 2017-12-29 06:26:30 -06:00
LetterJay
80ce187d3d Merge pull request #4583 from Citadel-Station-13/upstream-merge-33873 
[MIRROR] The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
 2017-12-29 06:26:06 -06:00
LetterJay
b8370a7786 Merge pull request #4582 from Citadel-Station-13/upstream-merge-33882 
[MIRROR] Spell action buttons finally fixed
 2017-12-29 06:25:54 -06:00
LetterJay
71a51528c3 Merge pull request #4581 from Citadel-Station-13/upstream-merge-33847 
[MIRROR] Adds colour shift to timestop
 2017-12-29 06:25:41 -06:00
LetterJay
72ab9444c1 Merge pull request #4578 from Citadel-Station-13/upstream-merge-33876 
[MIRROR] Cleans up survivor counting tiny bit
 2017-12-29 06:25:11 -06:00
LetterJay
9d7dc29efc Merge pull request #4577 from Citadel-Station-13/upstream-merge-33874 
[MIRROR] CTF flags are no longer locked to CTF.
 2017-12-29 06:24:57 -06:00
LetterJay
cbc43aeacf Merge pull request #4576 from Citadel-Station-13/upstream-merge-33875 
[MIRROR] Makes default admin websound volume work again.
 2017-12-29 06:24:42 -06:00
LetterJay
79e9e039a8 Merge pull request #4575 from Citadel-Station-13/upstream-merge-33878 
[MIRROR] Fixes ghost light not moving while orbiting
 2017-12-29 06:24:21 -06:00
LetterJay
0f328e22b2 Merge pull request #4574 from Citadel-Station-13/upstream-merge-33558 
[MIRROR] Dead cultists can now cross Reebe's "Servant Blocker"
 2017-12-29 06:24:09 -06:00
LetterJay
b13d4dd721 Merge pull request #4572 from Citadel-Station-13/upstream-merge-33807 
[MIRROR] Made atoms not smooth with shuttles
 2017-12-29 06:23:12 -06:00
LetterJay
93914f2a31 Merge pull request #4571 from Citadel-Station-13/upstream-merge-33902 
[MIRROR] Fixes admin fingerprintslast
 2017-12-29 06:23:01 -06:00
LetterJay
f093bb8fec Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856 
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
 2017-12-29 06:22:35 -06:00
LetterJay
3c204c0125 Merge pull request #4569 from Citadel-Station-13/upstream-merge-33867 
[MIRROR] Fixes ethanol + book reaction message
 2017-12-29 06:22:26 -06:00
LetterJay
bbaee9f3d7 Merge pull request #4568 from Citadel-Station-13/upstream-merge-33880 
[MIRROR] Fixes wall CanPass
 2017-12-29 06:22:13 -06:00
LetterJay
c7db4e8310 also syncs a bunch of shit 2017-12-29 04:12:43 -06:00
YPOQ
a41a508475 Fixes air alarm contaminated mode (#33899) 
* Fixes air alarm contaminated mode

* set_filters, paths instead of ids

* Readds gasid2path call
 2017-12-29 02:57:42 -06:00
XDTM
6eabea6a71 Corrects abductor uncuffing message (#33895) 
* Corrects abductor uncuffing message

* breaks
 2017-12-29 02:56:30 -06:00
YPOQ
8bf721d5b7 Fixes plant juicing (#33896) 2017-12-29 02:56:22 -06:00
Buggy123
2c40a61968 Increases research point income by 33% (#33857) 2017-12-29 02:55:10 -06:00
MoreRobustThanYou
07ba4e8189 The Radiance (eminence after ratvar awakens) can now ignore chapel tiles (#33873) 2017-12-29 02:55:03 -06:00
Robustin
d7723a064c Spell action buttons finally fixed (#33882) 
* Action button fix

* Action button fix

* Spell action button fix

* Spell action button fix

* Update alien_powers.dm

* Update spell.dm

* Action button fix

* Update touch_attacks.dm
 2017-12-29 02:54:50 -06:00
CosmicScientist
0078782285 Adds colour shift to timestop (#33847) 
* For PKPenguin, from Cosmic

* Removes a colour removal line due to no functionality
 2017-12-29 02:53:37 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
LetterJay
1047dccdd5 fk 2017-12-29 01:20:09 -06:00
deathride58
96543b5e63 Merge pull request #4566 from Citadel-Station-13/upstream-merge-33881 
[MIRROR] Makes reset_perspective handle turf as eye
 2017-12-29 06:48:10 +00:00
deathride58
b03a8a70db Merge pull request #4556 from Citadel-Station-13/upstream-merge-33442 
[MIRROR] [READY]Adds picking up corgis and pAIs!
 2017-12-29 06:47:17 +00:00
deathride58
bc6df43cd0 Merge pull request #4565 from Citadel-Station-13/upstream-merge-33879 
[MIRROR] Removes typepath from random event admin message
 2017-12-29 06:45:22 +00:00
Leo
ad59b058ad Merge pull request #33876 from AnturK/roundend_feedback_standard 
Cleans up survivor counting tiny bit
 2017-12-29 00:29:49 -06:00
Buggy123
6ce76e38d4 CTF flags are no longer locked to CTF. (#33874) 
* CTF flags are no longer locked to CTF.

* Var added to enable/disable pickup by anybody.
 2017-12-29 00:29:42 -06:00
AnturK
fa7d2a4790 Makes default admin volume work again. (#33875) 2017-12-29 00:29:35 -06:00
Jordan Brown
77f9295df2 Fixes ghost light not moving while orbiting (#33878) 2017-12-29 00:29:27 -06:00
Robustin
a9a94f7aed Dead cultists can now cross Reebe's "Servant Blocker" (#33558) 
* Dead Cultist Exception

* Servant blocker update

* Corpse balance

* Lets corpses pass servant blocker

* Lets cult corpses pass servant blocker

* Update servant_blocker.dm

* Update open.dm

* Update servant_blocker.dm

* Update open.dm
 2017-12-29 00:29:19 -06:00
Cruix
ab408d3e97 Made atoms not smooth with shuttles (#33807) 
* Made atoms not smooth with shuttles

* Shuttle area canSmoothWithAreas is automatically assigned to the area's type if it is null

* Moved pirate shuttle areas into the multi-area shuttles section
 2017-12-29 00:29:04 -06:00
oranges
4e1770a21f Fixes admin fingerprintslast 2017-12-29 00:28:55 -06:00
YPOQ
6fac704a4f Fixes AI eyes getting nullspaced when jumping to deleted cameras (#33856) 2017-12-29 00:28:47 -06:00
Robustin
4157c30fd8 Fixes ethanol + book reaction message (#33867) 2017-12-29 00:28:40 -06:00
AnturK
fbdf24ddd4 Fixes wall CanPass (#33880) 2017-12-29 00:28:32 -06:00
Leo
868fbec32d Merge pull request #33881 from AnturK/walls-have-eyes 
Makes reset_perspective handle turf as eye
 2017-12-29 00:28:18 -06:00
Jordan Brown
067680155f Removes typepath from random event admin message 2017-12-29 00:28:10 -06:00
coiax
dc6b4e2b61 Christmas event changes (#33861) 
* A christmas tree with presents is now a subtype

Admins can now spawn `/obj/structure/flora/tree/pine/xmas/presents`
directly, instead of spawning regular christmas trees and then
triggering the event.

Also, the event now just deletes and replaces the xmas tree with a
present tree; saves on duplication of icon states and vars and all that.

* Code review I

* Gaia's Landing: The PR
 2017-12-29 00:28:02 -06:00
LetterJay
8a792d6ef6 more save points 2017-12-29 00:07:36 -06:00
LetterJay
b3793ee6d4 Update living.dm 2017-12-28 23:58:07 -06:00
LetterJay
2ac9d9a171 Merge pull request #4554 from Citadel-Station-13/upstream-merge-33858 
[MIRROR] Adds open/close sound to blastdoors and shutters
 2017-12-28 23:57:40 -06:00
LetterJay
40859e3c0a Merge pull request #4563 from deathride58/anthromedibots 
[READY] Adds a new alternate sprite for mediborgs from Paradise (with modifications from Vivi) and more!
 2017-12-28 23:50:00 -06:00