Commit Graph
1717 Commits
Author SHA1 Message Date
Putnam3145 970e089fb0 glass houses 2021-07-03 03:52:07 -07:00
Putnam3145 15078f0f71 Properly optimizes watchers 2021-07-03 03:50:43 -07:00
Putnam3145 e11cc190e7 Watcher optimization 2021-07-03 03:40:34 -07:00
Putnam3145 f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
siliconsandGitHub a29d107d33 Merge pull request #14899 from shellspeed1/blood-drunk-miner-drop
Moves tendril KA upgrade disks to blood drunk miner.
2021-06-29 08:51:10 -07:00
shellspeed1 26cb16311d A 2021-06-27 20:08:33 -07:00
Putnam3145 630098c8aa that might be all 2021-06-21 20:03:27 -07:00
Putnam3145 0bf383a90b does this fix it 2021-06-21 09:18:06 -07:00
Putnam3145 f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -07:00
siliconsandGitHub 3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon
(READY) Ports Space Dragon Midround Event.
2021-06-18 20:03:43 -07:00
Putnam3145 dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -07:00
Putnam 833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
Timothy Teakettle baad78e7fe bee 2021-06-11 16:08:55 +01:00
siliconsandGitHub 09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon
New Challenger: The Cat Surgeon has appeared! (Ready!)
2021-06-09 11:29:24 -07:00
siliconsandGitHub eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00
siliconsandGitHub c0e3b8d5ef Merge pull request #14809 from SandPoot/speak-nice-yes
Centralizes borg speech and uses some of the icons for the typing indicator
2021-06-09 11:15:01 -07:00
Putnam 86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
SandPoot b0940456f5 upload files 2021-06-08 13:13:22 -03:00
keronshb 40f9941849 Fixes invisibility when being dragged and glass table cheese 2021-06-04 22:52:03 -04:00
keronshb 70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
WanderingFox95andGitHub df0e1057d1 Imagine this crazy person became a threat suddenly 2021-05-30 21:15:44 +02:00
keronshb 7dbab19597 Fixes the linters and adds a proper async 2021-05-27 00:14:43 -04:00
keronshb 78db6bd5c2 Ports Floor Cluwnes
Oh fuck oh god
2021-05-26 21:58:35 -04:00
siliconsandGitHub e1a800ff49 Merge pull request #14742 from keronshb/specialhudport
(READY) Ports Special Hud icons for some simple mobs
2021-05-22 01:37:59 -06:00
Putnam e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
keronshb 88dc0821d1 User gibs when being turned into a spess dragon 2021-05-19 19:49:48 -04:00
keronshb 1d843cc72f Part 3 - the missing stuff 2021-05-19 19:19:35 -04:00
keronshb a6e157ba73 IT WORKS!! 2021-05-19 19:03:21 -04:00
LinandGitHub 0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes
[Fix] Even More bug fixing
2021-05-19 14:49:00 -05:00
keronshb 60965939d6 bigger mobs have some special health bars (#49104)
* cool beans

* more, more!

* smol fix
2021-05-19 11:59:50 -04:00
keronshb b8b25662ff Couple of fixes, almost ready to go 2021-05-18 22:12:02 -04:00
keronshb d2f69acaf8 Space Dragon Event
Ports the Space Dragon event
2021-05-18 12:06:32 -04:00
qweq12yt ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03:00
bc35ffeaa2 [READY] Space Dragon Quality Improvement Update (#57942)
qol: Space Dragon's gust attack is now tied to right click instead of an ability button
balance: Space Dragon has received numerous balance changes, most notably that Space Dragon will stall the shuttle until it loses or completes its objectives
fix: Fixed numerous bugs with Space Dragon, most notably the rifts not vanishing after Space Dragon's death
soundadd: Space Dragon now has a custom roar for dying and winning
imagedel: Deleted now unused Space Dragon ability icon
refactor: Space Dragon's speed changes are now controlled using movespeed modifiers instead of direct speed adjustments

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-05-14 12:35:53 -04:00
Ghomandkeronshb 0b06957dc7 Space Dragons are now actually capable of flight. (#57428)
* Space Dragons are now actually capable of flight.

* Gives them the tag so the flying animation doesn't apply, it looks like shit without this
2021-05-14 12:33:11 -04:00
keronshb a6ae645fc2 Space Dragon Fixes (#55759) 2021-05-14 12:32:48 -04:00
keronshbandJared-Fogle 3aa72f7d31 Space Dragon QOL and Additional Features (#54124)
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2021-05-14 12:31:42 -04:00
keronshb 7e5a44cbd6 Minor refactor to space dragon code to fix various bugs and issues (#53944) 2021-05-14 12:28:59 -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
siliconsandGitHub 5601badbff deterministic explosion system (#13392)
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
2021-05-12 05:44:53 -05:00
LetterN 2bf221be4f fixes syndie simplemob 2021-05-09 21:35:15 +08:00
siliconsandGitHub 17d7c4dd9a Merge pull request #14659 from DrPainis/patch-12
Bubblegum HALLUCINATIONS are capitalized
2021-04-28 21:17:15 -06:00
silicons 47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
DrPainisandGitHub e313fed033 hallucinations are capitalized too 2021-04-25 19:04:07 -04:00
WanderingFox95andGitHub ace2f522fb No more Suicidal Parrots! (Ready) (#14628)
* Modifies Parrots

They spawn from hostile triggers, not as friendly pets now.

* Removes Parrots from Gold Extracts altogether
2021-04-24 21:47:04 +02:00
DrPainisandGitHub 7d6cb67c91 literally just changes one letter (#14634) 2021-04-24 21:40:41 +02:00
siliconsandGitHub 75e3f5eae6 Merge pull request #14573 from zeroisthebiggay/eatshitanddie
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
2021-04-21 13:50:46 -06:00
DrPainisandGitHub ac96276f8e literally just changes one letter 2021-04-20 16:20:44 -04:00
siliconsandGitHub af7bb2e09f Merge pull request #14585 from zeroisthebiggay/cumbblegum
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
2021-04-18 19:00:14 -06:00
DrPainisandGitHub ec67182421 makes drakes drop meat 2021-04-17 02:58:22 -04:00