shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,747 Commits 5 Branches 0 Tags
ff64050f8ae568ba96fa93e60eccfb0b1bcd940c
Commit Graph

685 Commits

Author SHA1 Message Date
zerothebigboy
c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-09-19 15:23:52 -04:00
silicons
c4386c0a4f Merge pull request #15175 from buffyuwu/hallucination 
meme pr that adds a hallunciation sound
 2021-09-19 11:11:05 -07:00
buffyuwu
bdf46b1d46 meme pr 2021-09-18 04:53:17 -04:00
DeltaFire
f7bcfa57ae safety 2021-09-13 23:28:02 +02:00
silicons
6de44f794e Merge pull request #15010 from Putnam3145/atmos-funnies 
Supermatter surge rework: consequential for N2, won't explode immediately for CO2
 2021-08-26 21:39:33 -07:00
zerothebigboy
06181f51ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	code/modules/ninja/suit/suit.dm
 2021-08-19 21:55:22 -04:00
Putnam3145
22fae70132 Supermatter surge rework 2021-08-14 19:39:31 -07:00
BlueWildrose
d1a1c737d4 Blacklists incapacitated mobs from being sentience event candidates 2021-08-13 11:29:54 -07:00
Putnam3145
39679ea239 explicit "no rads" sentence 2021-08-05 06:19:29 -07:00
Putnam3145
571c017eec Also makes the end stuff only show if announced 2021-08-05 06:18:33 -07:00
Putnam3145
f821315263 Halves probability on supernova rads 2021-08-05 06:14:38 -07:00
WanderingFox95
f8f6dcae14 Add files via upload 2021-07-03 22:17:06 +02: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
silicons
5204f5a6d9 Merge pull request #13991 from Putnam3145/auxtools-atmos 
Replaces extools with auxtools; atmos overhaul
 2021-06-27 11:01:32 -07:00
Putnam3145
0f229495d0 aaand i forgot some /proc/s 2021-06-21 20:32:55 -07:00
Putnam3145
fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
WanderingFox95
49f4ca0d17 Added an announcement. 
Not sure on the exact tone of it,
but this will do for now.
 2021-06-21 16:24:59 +02: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
zerothebigboy
fb32aa1248 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-06-20 03:29:50 -04:00
silicons
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
MrJWhit
a324701730 Revert "adds cat meteors" 2021-06-13 05:25:02 -04: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
zerothebigboy
1a90c96e4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/feet_digi.dmi
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/mask_muzzled.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/items_and_weapons.dmi
 2021-06-09 17:40:28 -04:00
silicons
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
silicons
224efa0e26 Merge pull request #14762 from DrPainis/patch-2 
adds cat meteors
 2021-06-09 11:21:55 -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
keronshb
70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
WanderingFox95
249d23a6cc Fixed something with the event 2021-05-31 09:52:31 +02:00
WanderingFox95
2516afbbba Cat Surgeon Event 
If I did it right, thanks Keron!
 2021-05-31 00:41:59 +02:00
zerothebigboy
8b9763a6a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 2021-05-28 15:42:58 -04:00
DrPainis
d42fb1ae90 makes cat meteors significantly rarer than meaty ores 2021-05-27 12:17:41 -04:00
keronshb
8f1db2d5ec Fixes some stuff 
Actually ticks the spell, fixes the brain damage issue, etc.
 2021-05-27 12:16:54 -04:00
DrPainis
1ce8ffba11 fixes the typepath for cat meteors 2021-05-27 11:48:09 -04:00
DrPainis
1b8ef53014 maybe makes this compile 2021-05-27 00:55:41 -04:00
DrPainis
cbb7673e79 Adds the actual event. 
Yes, cat meteors have the same announcement as carp.
 2021-05-27 00:30:29 -04:00
DrPainis
98d5499712 adds the cat wave_type 2021-05-27 00:25:55 -04:00
keronshb
78db6bd5c2 Ports Floor Cluwnes 
Oh fuck oh god
 2021-05-26 21:58:35 -04:00
Linzolle
1bb911441c fix brand intelligence runtime 2021-05-24 17:53:05 -05: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
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
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
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
Lin
c0a56eb766 Merge pull request #14695 from Putnam3145/supernova-end-notification 
Supernovae now announce when over, + other supernova tweaks
 2021-05-10 01:24:05 -05:00
Putnam
8d96de6b03 More tweaks, whoops 2021-05-06 14:52:17 -07:00
Putnam
ecca9d788b More supernova tweaks 2021-05-06 14:32:13 -07:00
zerothebigboy
90930494d6 k 2021-05-05 18:43:11 -04:00
zerothebigboy
c8ebe720ec k 2021-05-05 18:25:05 -04:00
zerothebigboy
5138d86655 skylarlineman'safurry 2021-05-05 03:35:25 -04:00