Commit Graph

67 Commits

Author SHA1 Message Date
Poojawa
7d488e8f4c Citadel'd Maps from #5523 (#5551)
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
2018-02-17 18:04:28 -06:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBot
0c74a7eede [MIRROR] Holorays! (#5261)
* Holorays!

* adding missing .dmi
2018-02-05 01:10:29 -06:00
Poojawa
4ce8f9ec80 clean up icons folder of unused .dmis 2018-01-31 07:38:58 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Jordan Brown
b9f575fa11 Merge pull request #34926 from ShizCalev/morguetray-revenant
Makes revenants spawn on dead bodies & bodycontainers
2018-01-28 18:03:41 -06:00
ShizCalev
6ed56158e3 Adds new landmark icons (#34848)
* Adds new landmark icons

* Update

* Blue
2018-01-24 18:08:33 -06:00
LetterJay
d60e61ecbc Merge pull request #4988 from Citadel-Station-13/upstream-merge-34691
[MIRROR] Fix Bananium Ore Overlay
2018-01-21 11:56:40 -06:00
uraniummeltdown
5f53625f0b fix bananium ore overlay 2018-01-21 02:56:07 -06:00
Dax Dupont
4826dec880 Adds holy vision (Some mobs can now see blessed tiles) (#34497)
* Blessed turfs are visible to people who care about blessed turfs

* A better way

* Adds holy vision

* Compacts special types

* space space space

* Glowing

* Final Solution

* wraith

* bawhoppen has autism and we must hugbox

* Implements feedback
2018-01-21 02:04:47 -06:00
deathride58
216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-10 22:43:58 +00:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
deathride58
f57e02ce95 Merge branch 'master' into donoritemmodularization 2017-12-04 20:17:02 -05:00
ACCount
b15481c7cd Removes some unused sprite files (#33121)
* Removes two unused sprite files

* Removes two more sprites
2017-11-28 06:28:23 -06:00
deathride58
60b2c25668 donator item modularization + manual sync of sprites upstream 2017-11-22 17:16:37 -05:00
nicbn
46c62b6293 overhaul (#32316) 2017-11-03 23:40:27 -05:00
nicbn
8aef4f3b57 Rename brown gas to nitryl (#32271) 2017-11-01 21:37:20 -05:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
LetterJay
e63f93979f Merge pull request #2979 from Citadel-Station-13/upstream-merge-30572
[MIRROR] Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
2017-09-30 02:41:38 -04:00
KorPhaeron
bdae94f60c Shooting walls can create bullet holes/dents (#30714)
* Bullet holes in walls

* Code standards, new sprite
2017-09-28 21:48:27 -05:00
XDTM
9b5a2f7490 Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow 2017-09-28 16:02:31 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
kevinz000
c64aeef239 Revert "goddamnit (#2491)" (#2510)
This reverts commit d2c89ad25c.
2017-08-26 16:13:23 -07:00
kevinz000
d2c89ad25c goddamnit (#2491) 2017-08-26 04:50:59 -07:00
CitadelStationBot
772299445e Makes the Ark of the Clockwork Justicar much more fancy 2017-08-20 19:55:15 -05:00
CitadelStationBot
0cffa7efaa Fixes the right-facing pie face sprite being a pixel off 2017-08-06 03:12:04 -05:00
CitadelStationBot
8ca4b9d614 Clockcult Combat Rebalance + Conversion Rework (#2020)
* Removes Soul Vessel, Cogscarab, and Anima Fragment Scriptures

* Update tips.txt

* no one cares

* manual clockcult syn
2017-08-04 11:46:22 -07:00
CitadelStationBot
6f855fbd52 Adds another planetstation mob, the "Seedling" (#2233) 2017-08-03 06:01:28 -07:00
LetterJay
2d096997bc removes the 'yiff in hell' graffiti artwork 2017-07-18 05:25:38 -05:00
CitadelStationBot
4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -05:00
CitadelStationBot
d7d9e775e8 Fixes the invisible rune 2017-07-06 08:26:11 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
196db74cbe Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588
[MIRROR] Changes to the Atmos Watertank Backpack
2017-06-27 22:59:32 -05:00
CitadelStationBot
5cf2065432 Ninja Dash 2017-06-26 08:57:46 -05:00
CitadelStationBot
bac0b96000 Changes to the Atmos Watertank Backpack 2017-06-20 20:49:11 -05:00
CitadelStationBot
a090e33a15 Adds Prolonging Prism as an application scripture (#1472) 2017-06-17 13:31:04 -07:00
LetterJay
c1af381233 Merge pull request #1460 from Citadel-Station-13/upstream-merge-28142
[MIRROR] Adds another parallax layer
2017-06-14 08:55:44 -05:00
CitadelStationBot
5db49fb44b Last Cult Master Spell: Eldritch Pulse & Various Tweaks (#1430) 2017-06-13 13:48:36 -07:00
CitadelStationBot
cb15acf8b2 Adds another parallax layer 2017-06-07 14:18:39 -05:00
LetterJay
34e74a377e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442 2017-05-24 08:06:53 -05:00
CitadelStationBot
6b4b6ee70d Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls 2017-05-22 22:21:20 -05:00
CitadelStationBot
4533d31e34 Cult Fixes for Construct Icons and Spells 2017-05-22 10:49:33 -05:00
CitadelStationBot
1dcad5fa0e Fixes pkborg fields not updating location or draining power 2017-05-21 22:28:20 -05:00
CitadelStationBot
12bbacec25 [MIRROR] Adds framework for cult constructs having the ability to make runes (#1010)
* Adds framework for cult constructs having the ability to make runes

* Delete mobs.dm.rej

* Update runes.dm

* clean .rej
2017-05-20 23:12:51 -05:00
CitadelStationBot
88ede32216 [MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#994)
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition

* Rej cleanup

* update mob.dmi

* Update living_defense.dm
2017-05-20 23:00:02 -05:00
CitadelStationBot
36072177f9 [READY]Peacekeeper cyborg projectile dampening fields, attempt three 2017-05-18 16:36:50 -05:00