ShizCalev
6ed56158e3
Adds new landmark icons ( #34848 )
...
* Adds new landmark icons
* Update
* Blue
2018-01-24 18:08:33 -06:00
LetterJay
b603bb9fbb
Merge pull request #5041 from Citadel-Station-13/upstream-merge-34767
...
[MIRROR] Fix replace_random_law runtime
2018-01-23 08:23:10 -06:00
oranges
58855df5dd
Merge pull request #34767 from AutomaticFrenzy/patch/replace-random-law
...
Fix replace_random_law runtime
2018-01-23 01:43:00 -06:00
ShizCalev
dfdf01e79e
Fixes portal storm event ( #34725 )
2018-01-22 16:25:19 -06:00
deathride58
28751ba370
Merge pull request #5001 from Citadel-Station-13/upstream-merge-34633
...
[MIRROR] Refactor weather to use Z traits, assorted related cleanup
2018-01-21 22:42:53 +00:00
Tad Hardesty
4451aca2e8
Refactor weather to use Z traits, assorted related cleanup ( #34633 )
...
* Add a proc for getting the station center
* Add a couple of comments to ZTRAIT defines
* Remove unused global_map list
* Refactor weather to use the trait system
* Un-hardcode the transit z-level
* Use Z traits to determine Portal Storm event areas
* Fix loading away missions containing anything that reads traits
2018-01-21 13:34:04 -06:00
ShizCalev
68cfdb617b
Fixes rev mindswap ( #34567 )
2018-01-21 12:29:12 -06:00
AnturK
3dc89ba058
Antag Panel / Check antagonists Refactor
2018-01-19 08:43:49 -06:00
Jordan Brown
05d87d54a3
Merge pull request #34438 from XDTM/EqualHallucinations
...
Mass hallucinations now gives the same hallucination to everyone
2018-01-18 16:52:03 -06:00
Jordan Brown
5e7e4c934d
Merge pull request #34505 from AutomaticFrenzy/patch/camera-failure-crash
...
Fix Camera Failure crashing the server if there are no cameras
2018-01-16 08:39:54 -06:00
ShizCalev
80095fea0a
Replaces cached get_area vars for names ( #34338 )
2018-01-13 20:56:11 -06:00
Leo
4ae8e504df
Remove unnused random event
2018-01-13 04:31:21 -06:00
Tad Hardesty
72319a9794
Replace hardcoded z-level numbers with a trait system
2018-01-11 14:06:17 -06:00
oranges
3b9b6f156e
Merge pull request #33933 from coiax/wizard-late-joining
...
Late joiners also get summoned guns/magic
2018-01-10 03:11:56 -06:00
deathride58
5dc3f29ad4
modules - E to L
2018-01-04 00:53:38 -05: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
10643a192e
Update vent_clog.dm
2017-12-30 13:33:01 -06:00
LetterJay
de10a5b223
Update spider_infestation.dm
2017-12-30 13:32:53 -06:00
LetterJay
f698fd5329
Update disease_outbreak.dm
2017-12-30 13:32:46 -06:00
LetterJay
2fe40198a2
Update alien_infestation.dm
2017-12-30 13:32:38 -06:00
LetterJay
dae3c3efb5
Merge branch 'master' into upstream-merge-33621
2017-12-30 13:23:39 -06:00
Tad Hardesty
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -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
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
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
e2d2c8cda0
Merge branch 'master' into upstream-merge-33627
2017-12-27 04:41:27 -06:00
LetterJay
62a9649a98
Update disease_outbreak.dm
2017-12-25 05:23:37 -06:00
LetterJay
7b40f3f0e0
Update disease_outbreak.dm
2017-12-25 05:09:21 -06:00
LetterJay
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
CitadelStationBot
938f409782
[MIRROR] Christmas ( #4491 )
...
* Christmas (#33690 )
* Christmas Event Updates
* Dont recreate the list every time
* Check for drop del
* Changes some things to placate that one guy from FTL
* Christmas
2017-12-22 13:14:25 -08:00
LetterJay
8ea38cfde2
Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681
...
[MIRROR] Immovable rod abuse, smite and event trigger.
2017-12-21 04:55:32 -06:00
AnturK
6c4d687db6
Immovable rod abuse, smite and event trigger. ( #33681 )
2017-12-21 00:11:20 -06:00
LetterJay
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
LetterJay
9ab75d37b7
Update operative.dm
2017-12-19 19:35:41 -06:00
LetterJay
bcbb4102bf
Update disease_outbreak.dm
2017-12-19 18:50:43 -06:00
LetterJay
63b1b1df88
Update disease_outbreak.dm
2017-12-19 18:40:20 -06:00
LetterJay
56737f32de
Update disease_outbreak.dm
2017-12-19 17:59:55 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
LetterJay
516db4851f
Update disease_outbreak.dm
2017-12-19 16:53:21 -06:00
LetterJay
16f1a07b92
diseases
2017-12-19 16:41:09 -06:00
duncathan salt
0f2fd05e87
removes silly garbage defines
2017-12-19 08:02:18 -06:00
Emmett Gaines
8cf30a65fb
dock() re-organization
2017-12-18 21:23:58 -06:00
LetterJay
fa0bcde791
Update disease_outbreak.dm
2017-12-18 17:24:49 -06:00
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
LetterJay
e6aaad1921
Update disease_outbreak.dm
2017-12-17 15:58:06 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
Robustin
7d1485643e
Fixes race swap ( #33566 )
2017-12-17 04:11:40 -06:00
