eb7f2ddc99
Merge branch 'master' of https://github.com/tgstation/tgstation into GG3
...
# Conflicts:
# icons/obj/guns/projectile.dmi
2017-05-21 17:54:44 -04:00
2a9ab50f87
Merge pull request #27466 from Cyberboss/patch-87
...
Fixes talisman grammar
2017-05-21 16:25:27 -03:00
bea1ea06c0
Update cult_comms.dm ( #27494 )
2017-05-21 06:18:14 -04:00
7942aa4e5b
Two more types of Legion and makes environment_smash levels into defines ( #27160 )
...
One is another small legion, but it can infest corpses, meaning it will revive other legions if you don't kill it first.
The other is a legion that creates legions. I imagine it as something super edgy like a golem made up of legions melded together.
I need sprites for both of these
Added defines for environment_smash
2017-05-21 19:51:52 +12:00
47fcb65362
Merge pull request #27402 from lzimann/goddamn
...
Fixes syndicate borg spawner
2017-05-20 23:19:15 -04:00
44bcd278dd
Merge branch 'master' into ganguns
2017-05-20 19:41:52 -04:00
de45c268ed
Merge pull request #27283 from Robustin/gangclothes
...
Decentralized and Vastly Improved Gang Influence System
2017-05-20 19:36:51 -04:00
20983dbc02
Fixes talisman grammar
2017-05-20 14:33:25 -04:00
d273f7afbd
ohhhhh
2017-05-19 13:23:34 -04:00
b748100324
jobs done
2017-05-19 12:35:52 -04:00
8c68f56584
color attempt 3
2017-05-19 10:50:28 -04:00
cd36fef8d3
Update gang_items.dm
2017-05-19 10:40:39 -04:00
7d8e15b43c
Yay color
2017-05-19 10:28:22 -04:00
49c2ea44c8
Merge pull request #27376 from ChangelingRain/ratvarwalls
...
If ratvar is alive, turning clockwork floors into clockwork walls is fast
2017-05-19 08:25:05 -03:00
f02961232b
Fixes syndicate borg spawner
2017-05-18 18:09:14 -05:00
3a68408dfb
Maybe adds the gang's color to the button
2017-05-18 19:04:38 -04:00
305b836e0f
Makes clearer that gang outerwear is armored
2017-05-18 12:56:13 -04:00
6ecedf47c8
Update gang_datum.dm
2017-05-18 12:27:29 -04:00
76e2627386
Wetwork boots
2017-05-18 12:26:22 -04:00
fb78862664
Tweaks
2017-05-18 12:18:01 -04:00
c97bfa0e9f
Proselytizing alloy shards will now proselytize all the shards in the tile ( #27337 )
2017-05-18 12:42:44 -03:00
68bbd65ab8
fixes ratvar shuttles ( #27347 )
2017-05-18 12:37:13 -03:00
ee404b2170
World.dm Refactor ( #27268 )
...
* Cleanup world/New
* Moves some things from OnReboot SS Shutdowns
* Move mode handling procs to ticker
* Moves delayed reboot to ticker
Cleans up round end sound setting
Splits round end animation between SStitle and SSticker
* Moves PR announcement to where it can use the define
* Clean this bit up
* Move out datacore Initialization
* Fix some stuff
* Fix this for
* Different PR
* Gives admins reboot options
* Make it smaller
2017-05-18 21:53:46 +10:00
1b7c4a63dc
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual ( #27344 )
2017-05-17 22:54:54 -05:00
074727555d
Merge pull request #26677 from coiax/codespeak
...
Codespeak language and manual
2017-05-17 22:04:16 -04:00
5ca9f66501
Manned gets spanned
2017-05-17 20:25:20 -04:00
8ecae83c09
If ratvar is alive, turning clockwork floors into clockwork walls is fast
2017-05-17 16:45:16 -04:00
da8f5470fc
Fixes and tweaks
2017-05-17 14:24:06 -04:00
24a997216c
Protip
2017-05-17 11:24:45 -04:00
cc6c5d026c
descriptive
2017-05-17 11:22:21 -04:00
801dc2bc0b
Taste the rainbow
2017-05-17 10:57:52 -04:00
0e6bd13d34
Merge pull request #27333 from 4dplanner/revenantdeath
...
Stops people from beating a dead horse (revenant)
2017-05-17 22:03:19 +12:00
648e83f481
Adds framework for cult constructs having the ability to make runes ( #27266 )
2017-05-16 20:13:35 -03:00
7a4a7c3272
Merge branch 'master' of https://github.com/tgstation/-tg-station into gangguns2
...
# Conflicts:
# icons/obj/turrets.dmi
2017-05-16 17:37:00 -04:00
ca6619a878
Body and Mind memes
2017-05-16 17:25:34 -04:00
d99bf18f6a
Update gang_pen.dm
2017-05-16 10:52:57 -04:00
507de82220
Adds some TRUE/FALSE defines, fixes dying too many times
2017-05-16 14:55:31 +01:00
6f704c40aa
Fixes not being able to cancel Geis and being able to cancel Volt Void ( #27278 )
...
* Fixes not being able to cancel Geis
* volt can't tho
2017-05-16 09:01:29 +02:00
8b3579575b
Fixes clockwork obelisks ( #27277 )
2017-05-16 09:00:55 +02:00
3f47e55fe1
Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition ( #27085 )
...
* Chosen Harvesters
* Update runes.dm
* New Cult Ending
* New Cult Ending
* Cinematics added
* A couple fixes
* Update ticker.dm
* Final Touches
* Done
* Desc fix
* Update alert.dm
* Update cult_comms.dm
* requested changes
* Update uplink_item.dm
* Update alert.dm
* Update runes.dm
* Update runes.dm
* fuckinglaunchpad
* Update machine_designs.dm
* Fucking launchpad errors
* Update narsie.dm
* Update mode.txt
* moves a few pixels on the sprite for Joan
* whatever just merge it
* You know whats BS?
* While you're at it... merge this shit
* Update living_defense.dm
* Update constructs.dm
* Update living_defense.dm
2017-05-16 08:50:46 +02:00
afeb8f0496
Mandatory missing parenthesis in web editor
2017-05-15 20:20:25 -04:00
d93146bc89
Merge branch 'master' of https://github.com/tgstation/-tg-station into ganguns2
...
# Conflicts:
# icons/obj/turrets.dmi
2017-05-15 20:07:01 -04:00
4252ec4ecb
Tweaks and Proof of Concept
2017-05-15 19:51:08 -04:00
636f74b128
Merge pull request #27145 from Robustin/GangBang
...
Gangs now start with 3 leaders
2017-05-15 19:11:55 -04:00
895a8e6b6b
Retooling
2017-05-15 19:04:54 -04:00
7d9856211f
Retooling
2017-05-15 19:00:23 -04:00
2b436e4b6b
Merge pull request #27271 from coiax/cult-supply-talismans
...
Refactors supply talismans to be less shitcode
2017-05-15 18:53:29 -04:00
089d7ccde9
Fixes everyone having codespeak
2017-05-15 15:10:01 +01:00
0d89aae7f2
It works now
2017-05-15 14:23:59 +01:00
334f886d36
Wizards are now at least 30 years old. Apprentices are 17 to 29. ( #27245 )
2017-05-15 09:01:38 -03:00
Robustin
Leo
kevinz000
KorPhaeron
Joan Lung
Cyberboss
oranges
4DPlanner
Jack Edge
McBawbaggings