0f229495d0
aaand i forgot some /proc/s
2021-06-21 20:32:55 -07:00
fbbae70527
i need to go to bed and this is a LOT
2021-06-21 10:14:50 -07:00
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
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
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
3c7786dafd
Merge pull request #14734 from keronshb/SpaceDragon
...
(READY) Ports Space Dragon Midround Event.
2021-06-18 20:03:43 -07:00
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
a324701730
Revert "adds cat meteors"
2021-06-13 05:25:02 -04:00
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
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
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
224efa0e26
Merge pull request #14762 from DrPainis/patch-2
...
adds cat meteors
2021-06-09 11:21:55 -07:00
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
70926f5daf
Merge remote-tracking branch 'upstream/master' into floorcluwneport
2021-05-31 22:21:34 -04:00
249d23a6cc
Fixed something with the event
2021-05-31 09:52:31 +02:00
2516afbbba
Cat Surgeon Event
...
If I did it right, thanks Keron!
2021-05-31 00:41:59 +02:00
8b9763a6a1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-05-28 15:42:58 -04:00
d42fb1ae90
makes cat meteors significantly rarer than meaty ores
2021-05-27 12:17:41 -04:00
8f1db2d5ec
Fixes some stuff
...
Actually ticks the spell, fixes the brain damage issue, etc.
2021-05-27 12:16:54 -04:00
1ce8ffba11
fixes the typepath for cat meteors
2021-05-27 11:48:09 -04:00
1b8ef53014
maybe makes this compile
2021-05-27 00:55:41 -04:00
cbb7673e79
Adds the actual event.
...
Yes, cat meteors have the same announcement as carp.
2021-05-27 00:30:29 -04:00
98d5499712
adds the cat wave_type
2021-05-27 00:25:55 -04:00
78db6bd5c2
Ports Floor Cluwnes
...
Oh fuck oh god
2021-05-26 21:58:35 -04:00
1bb911441c
fix brand intelligence runtime
2021-05-24 17:53:05 -05:00
bd186d25cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-05-23 15:29:20 -04:00
b8b25662ff
Couple of fixes, almost ready to go
2021-05-18 22:12:02 -04:00
d2f69acaf8
Space Dragon Event
...
Ports the Space Dragon event
2021-05-18 12:06:32 -04:00
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
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
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
8d96de6b03
More tweaks, whoops
2021-05-06 14:52:17 -07:00
ecca9d788b
More supernova tweaks
2021-05-06 14:32:13 -07:00
90930494d6
k
2021-05-05 18:43:11 -04:00
c8ebe720ec
k
2021-05-05 18:25:05 -04:00
5138d86655
skylarlineman'safurry
2021-05-05 03:35:25 -04:00
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
f3ea2d58dc
Merge pull request #14602 from BlueWildrose/YoHoYoHofuckoff
...
Pirate related fixes and communication console fixes
2021-04-14 21:39:06 -05:00
32bbbecc39
pirate payoff minimum from 20k to 1k ( #14581 )
...
* removes 20k minimum on pirate payoff
* Update pirates.dm
2021-04-13 15:13:53 +02:00
8b47786556
Pirate stuff and comm console fixes
2021-04-13 00:53:55 -07:00
cbd7e0de6a
Merge pull request #14418 from LetterN/perlin-genny
...
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
2021-04-06 04:10:00 -06:00
74c00d17f8
let's be [redacted], its really in t his year
2021-03-31 09:43:15 +08:00
f976a89157
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-31 08:19:31 +08:00
ac432bdd25
remember to compile before sending commits
2021-03-24 18:31:06 -07:00
ebb233ab36
More supernova adjustments
2021-03-24 18:21:26 -07:00
e3fb2d5491
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-24 21:55:47 +08:00
263c564170
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/obj/clothing/suits.dmi
2021-03-23 13:25:13 -04:00
74e26f7a0c
Merge pull request #14436 from Putnam3145/supermatter-surge-rebalance
...
Buffed supermatter surge to make it up to 50x as strong as before.
2021-03-20 14:29:40 -06:00
292f67e098
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-20 20:36:56 +08:00
8456b3f709
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# icons/mob/clothing/head.dmi
# icons/mob/clothing/mask.dmi
# icons/mob/clothing/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/masks.dmi
# icons/obj/clothing/suits.dmi
2021-03-19 14:30:05 -04:00
Putnam3145