Commit Graph

103 Commits

Author SHA1 Message Date
keronshb
a6ae645fc2 Space Dragon Fixes (#55759) 2021-05-14 12:32:48 -04:00
keronshb
2eba3ae383 [READY]New Side Antagonist: Space Dragon (#42551)
* Add files via upload

* Rename space_dragon.dm to code/modules/events/space_dragon.dm

* Adds Space Dragon

* Adds Space Dragon Event

* Remove Copied File

* Put antagonist definition in proper location for space dragon

* Update space_dragon.dm

* Removed passive health regen from space dragon

* Updated Weight and Earliness for Space Dragon

* Added Objective to Space Dragon, Updated Starting Blurb

* Cleaned Up the Objective Determiner

* Actually fix the space dragon objectives

* Fix the objective display for the space dragon's target

* Updated Space Dragon Intro Blurb

* Updated Centcom Message When Space Dragon Spawns

* Updated Space Dragon's description with new lore

* Clean Up Space Dragon's OnFire()

* Add Space Dragon Sprites

* Sprite in wrong location

* Properly adds Space Dragon Sprites

* Adds Space Dragon Tiny Sprite to be Carp

* Space Dragon Uses New Sprites, Tiny Form Updated

* Increased Time Til' Dragon Spawn

* Drake's Tail Sweep Now Uses Prebuilt Spell

Thanks to Cobblestone for the head's up on this.
2021-05-14 12:27:03 -04:00
Artur
f5dc7d5c01 Makes cursed heart more tolerable 2021-01-07 22:27:13 +02:00
Ghommie
f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Ghommie
c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Ghom
16dea7ceed Revamped the paper wizard robes. (#12348)
* Better paper wizard robes.

* return value.

* ooo

* Aaa

* aaaa
2020-05-27 18:01:22 -07:00
Ghommie
71b725b511 Fixed several item action buttons not using their own states 2020-05-11 01:07:34 +02:00
Putnam
44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghommie
8c995dbad9 Making things work. 2020-04-13 19:16:55 +02:00
Ghommie
db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Ghommie
31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680)
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-04-07 15:21:50 +02:00
Ghommie
2045fb86f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-21 21:41:34 +01:00
kevinz000
6758761a65 Update action.dm (#11521) 2020-03-18 19:44:33 +01:00
Ghommie
d31075eb54 Spellcasting element 2020-03-11 16:23:30 +01:00
kevinz000
d7c5b87263 Update action.dm 2020-03-08 21:24:52 -07:00
Ghommie
97315940fe Polychromic element. 2020-03-08 01:01:21 +01:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
kevinz000
56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Detective Google
ca29246878 adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.) 2020-02-22 00:02:49 -06:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
Ghom
2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
ancientpower
a85f05a628 requested changes 2020-02-04 16:58:24 -06:00
ancientpower
0d6ffbc432 fixed it for real this time 2020-02-04 16:38:20 -06:00
ancientpower
9dd411f11b fixes the restoration for reals 2020-02-04 16:11:12 -06:00
ancientpower
524836c2b2 restores drink flinging 2020-02-04 15:48:03 -06:00
Seris02
49f80d52a8 bug fixes 2020-02-04 17:18:45 +08:00
ancientpower
937f6356ab vgstation drink sliding 2020-02-02 13:26:16 -06:00
Seris02
934c8fe533 updates + thingamajig 2020-01-23 15:25:45 +08:00
kevinz000
6e31db958c fixes 2020-01-20 12:08:18 -07:00
Seris02
a100f9382e better, there, happy now github 2020-01-20 14:51:53 +08:00
Seris02
5524b0fa03 yes. 2020-01-20 13:00:24 +08:00
kevinz000
f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
Seris02
25d7af31a5 merge fixes 2020-01-19 16:36:04 +08:00
Seris02
f54417f99e fixes 2020-01-19 15:50:48 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
1d184b8cad s 2020-01-16 00:21:21 -07:00
kevinz000
350c5aa060 compile 2020-01-16 00:18:40 -07:00
kevinz000
26525b8fa7 s 2020-01-16 00:14:03 -07:00
Putnam
6e9d13e48f Replace the cryopod with a simple ghost button. 2019-12-30 01:52:06 -08:00
Seris02
160e8c1ec5 stunglasses 2019-12-27 23:21:40 +08:00
BonniePandora
5efed32095 Ports Welding Hard Hats from /tg/
Changelog:
modules/clothing/head/Hardhat.dm:
-Added Welder Hard Hats & various colours
--They function as a combi hard hat & welder mask, but have a slightly dimmer head lamp
modules/clothing/vending/wardrobes.dm
-Added 3 Welder Hard Hats to the Engi-drobe and Atmos-drobe
-Equalized some values between the two (3 atmos winter coats now instead of 5, and 3 engineering dufflebags instead of 2)
game/objects/structures/crates_lockers/closets/secure/engineering.dm
-Replaced the welding mask in the CE's locker with a white WHH (This one has brighter buld in it! Same brightness as a regular hard hat)
datums/action.dm
- Added the item_action to lower the WHH's face shield
icons/mob/head.dmi
-Added weldervisor + welderhat, which are used by the WHH's
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
icons/mob/obj/hats.dmi
-Added weldervisor, again, used by the WHH's
-Repositioned the hardhat sprites up several pixels so they don't clip and look weird with the weldervisor
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
2019-11-04 02:29:56 +00:00
Trilbyspaceclone
937c809b0b Update action.dm 2019-07-31 12:57:10 -04:00
Ghommie
5a69499927 Hol up, unrelated PR time, atomization. 2019-06-07 01:32:15 +02:00
deathride58
cfaa0041b9 ports tgstation/tgstation#40260 2018-11-20 19:28:32 -05:00