Commit Graph

6250 Commits

Author SHA1 Message Date
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
silicons
a60f801f69 e 2021-05-12 04:23:53 -07:00
silicons
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
silicons
2d455e4da2 Merge pull request #14710 from Linzolle/anthro
Anthromorphic isnt a word
2021-05-12 04:42:28 -06:00
silicons
c5f13c44a8 Merge pull request #14708 from qweq12yt/misc-fixes
[Fix] Bugs are BAD!
2021-05-12 04:42:22 -06:00
silicons
3b1d66efc5 Merge pull request #14702 from zeroisthebiggay/fineilldooitmyself
bunny ears but they're not lops (vegas style)
2021-05-12 04:42:12 -06:00
Linzolle
4609d732f9 more spellcheck of anthropomorph 2021-05-10 17:15:43 -05:00
Lin
59914250c3 spellcheck 2021-05-10 17:04:48 -05:00
Lin
19d6ff8371 Merge pull request #14703 from LetterN/fixes-syndie-shit
balances syndie simplemob
2021-05-10 14:29:48 -05:00
qweq12yt
8c0911e968 fix hulks breaking cuffs/zipties 2021-05-10 15:56:50 -03:00
Timothy Teakettle
be9b1ddffb fixes 2021-05-10 14:43:45 +01:00
Timothy Teakettle
6095b4724f fixes fox markings legs 2021-05-10 01:54:24 +01:00
keronshb
cda492c6ba Removes the condition if they're knocked down 2021-05-09 20:10:38 -04:00
zerothebigboy
315e4fcdaa look at this dude 2021-05-09 19:28:07 -04:00
zerothebigboy
d2dbd7572b cyborgs and runtime fixes 2021-05-09 19:09:58 -04:00
LetterN
2bf221be4f fixes syndie simplemob 2021-05-09 21:35:15 +08:00
zerothebigboy
181dcc347b cum sex balls penis 2021-05-09 04:34:25 -04:00
silicons
633591b81e Merge pull request #14688 from SandPoot/good-tooltips
Makes tooltips good and creates a base for adding more.
2021-05-07 18:41:22 -06:00
Timothy Teakettle
5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
timothyteakettle
bef9473fa1 more migration fixes and general bugfixes 2021-05-07 16:10:20 +01:00
timothyteakettle
b1f84f94db Update body_markings.dm 2021-05-06 22:43:31 +01:00
timothyteakettle
80599201cf better fix 2021-05-06 22:39:07 +01:00
timothyteakettle
cb12843a34 bugfix 2021-05-06 22:35:15 +01:00
keronshb
7947258e51 Off balance disarm
If it hits a wall or a person while under the effect of off balance.
2021-05-05 23:57:01 -04:00
SandPoot
9cf04467a7 upload files 2021-05-05 17:55:30 -03:00
Timothy Teakettle
d39a60dd6b casually list the matrixes for several hundred sprites 2021-05-05 21:24:07 +01:00
Artur
8a3dd8515e fixes bleeding properly 2021-05-05 21:42:14 +03:00
Artur
cc59e2c225 feedback changes 2021-05-05 20:40:52 +03:00
Timothy Teakettle
ea071bd031 comment 2021-05-05 18:28:55 +01:00
Timothy Teakettle
ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
Artur
35bfba1f6a Redoes the variable changes into procs 2021-05-05 18:15:13 +03:00
Artur
28205f9dce More fixes to make it work 2021-05-05 17:41:37 +03:00
Artur
d9f6e51bc8 making it actually work properly 2021-05-05 15:26:20 +03:00
Artur
92e6646a4c time to make blood even more pain 2021-05-05 14:44:21 +03:00
keronshb
be2e962983 Off Balance for Guns only again
Was intended for guns
2021-05-04 00:51:16 -04:00
timothyteakettle
7265c7111c new limb covering var for markings 2021-05-03 22:47:22 +01:00
zerothebigboy
359c778955 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm
2021-05-02 22:47:39 -04:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
ac504d679b digi humans 2021-04-30 14:07:44 +01:00
silicons
17d7c4dd9a Merge pull request #14659 from DrPainis/patch-12
Bubblegum HALLUCINATIONS are capitalized
2021-04-28 21:17:15 -06:00
timothyteakettle
2f5cb63994 who deleted this 2021-04-28 17:37:09 +01:00
silicons
47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
silicons
1585d1c2be fixes 2021-04-26 23:32:33 -07:00
silicons
a415453540 ripping off my own code 2021-04-26 23:29:37 -07:00
silicons
eb2c12ceee yell wip 2021-04-26 23:10:10 -07:00
silicons
8fe45263c5 whew 2021-04-26 22:58:30 -07:00