shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,720 Commits 5 Branches 0 Tags
0fca5f80eb12d9977f34896e879674cbf2f736cd
Commit Graph

6345 Commits

Author SHA1 Message Date
keronshb
70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
Arturlang
84db564e0f Prettier? code 2021-06-01 02:25:06 +03:00
Arturlang
4b541d3dac phonecode 2021-06-01 02:21:33 +03:00
Artur
8687312935 Makes orbit menu show antags if DNR 2021-05-31 18:14:06 +03:00
WanderingFox95
df0e1057d1 Imagine this crazy person became a threat suddenly 2021-05-30 21:15:44 +02:00
zerothebigboy
7dea33f6c2 doge 2021-05-27 16:08:28 -04: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
zerothebigboy
bd186d25cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 2021-05-23 15:29:20 -04:00
silicons
eba3f554bc Merge pull request #14737 from zeroisthebiggay/KILL 
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
 2021-05-23 08:52:25 -06:00
zerothebigboy
25c99bb23c fuckihatecoding 2021-05-22 11:52:55 -04:00
zerothebigboy
37c3bc23a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair 
# Conflicts:
 2021-05-22 07:21:02 -04:00
silicons
92e019dd56 Merge pull request #14716 from Putnam3145/fix-blacklisting-traits 
Makes species/antag trait blacklist no longer remove ALL traits
 2021-05-22 03:41:57 -06:00
silicons
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
silicons
acdb57b0d1 Merge pull request #14739 from WanderingFox95/WanderingFox95-Ears 
A small ear related PR (Deer ears, Rabbit ears)
 2021-05-22 01:37:05 -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
zerothebigboy
af24fef322 inari 2021-05-21 20:46:48 -04:00
zerothebigboy
f54c893748 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair 2021-05-20 18:57:51 -04: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
a15637a929 Part 1 of Health Bars for Space Dragon 2021-05-19 19:18:19 -04:00
keronshb
a6e157ba73 IT WORKS!! 2021-05-19 19:03:21 -04:00
Lin
0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes 
[Fix] Even More bug fixing
 2021-05-19 14:49:00 -05:00
zerothebigboy
bc61ada440 KILL 2021-05-19 13:24:40 -04: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
WanderingFox95
0294ddb2a6 Apply suggestions from code review 
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
 2021-05-19 13:01:13 +02:00
WanderingFox95
4cd8cbd3e4 Same changes for the non human section of the ear file. 
consistency.
 2021-05-19 12:27:32 +02:00
WanderingFox95
eab45f0d64 Apply suggestions from code review 
They're very fair.

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
 2021-05-19 09:48:38 +02:00
keronshb
b8b25662ff Couple of fixes, almost ready to go 2021-05-18 22:12:02 -04:00
zerothebigboy
e7c0dea497 actually an eris hairdo 2021-05-18 22:04:59 -04:00
zerothebigboy
89b2d74895 actually an eris hairdo 2021-05-18 22:00:35 -04:00
WanderingFox95
808e94899f Ear Adjustments 2021-05-19 01:38:28 +02:00
Putnam
030361e1cc suggestions 2021-05-18 16:18:57 -07:00
zeroisthebiggay
55383e0387 Update hair_head.dm 2021-05-18 17:27:59 -04:00
zerothebigboy
20ac75020d steponmycock 2021-05-18 17:23:07 -04:00
zeroisthebiggay
cc29443b53 Update hair_head.dm 2021-05-18 17:06:20 -04:00
zerothebigboy
2a3eb07bfd steponmycock 2021-05-18 16:57:52 -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
qweq12yt
9dd372ed11 fix void cloak going to the void 2021-05-17 17:33:23 -03:00
keronshb
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
Ghom
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
keronshb
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
timothyteakettle
34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01:00
Artur
25371102f8 oh my god why are negatives truthy 2021-05-14 00:06:14 +03:00
Artur
b671b422b3 let's actually make it possible to gain actual blood if you're at 1 integrating blud 2021-05-12 22:50:45 +03:00
Putnam
1a92973d99 Antag/species quirk blacklist fix 2021-05-12 10:18:52 -07:00