silicons
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
DeltaFire
c7a098da06
suffering (aka, a bunch of fixes)
2021-06-21 19:05:31 +02:00
silicons
3c7786dafd
Merge pull request #14734 from keronshb/SpaceDragon
...
(READY) Ports Space Dragon Midround Event.
2021-06-18 20:03:43 -07:00
silicons
bc4773b728
Merge pull request #14831 from zeroisthebiggay/beltsprites
...
TG Resprite Compendium Atomization Project | Episode Six: Beltslot Sprites & Telebaton Resprite
2021-06-18 19:58:27 -07:00
keronshb
a192757843
BUG FIX: Changeling Bone Gauntlets work again ( #14862 )
...
* Fixes Bone Gauntlets
* Better fix
* return
2021-06-18 19:22:48 +02:00
silicons
8595e05ad9
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-13 15:37:35 -07:00
zerothebigboy
b7eecc315f
theeighteenthofmany
2021-06-11 19:49:43 -04:00
zerothebigboy
53e95b7356
theseventeenthofmany
2021-06-11 19:48:04 -04:00
silicons
a77aa8bd41
Merge pull request #14766 from Linzolle/cultfix
...
Fix cult area shenanigans, cult can do stuff in maint again.
2021-06-09 11:22:26 -07:00
silicons
eb4b4088f4
Merge pull request #14760 from keronshb/floorcluwneport
...
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00
silicons
dcd80edf5f
Merge pull request #14806 from zeroisthebiggay/patch-11
...
cuts the amount of essence revenant objective needs in half so it is actually feasibly possible
2021-06-09 11:17:52 -07:00
silicons
7af470efef
Merge pull request #14808 from SandPoot/fixes-soulstones
...
Fixes soulstones runtiming
2021-06-09 11:17:25 -07:00
silicons
7963dce24e
Merge pull request #14712 from keronshb/hereticadjustments
...
Minor Heretic rework and fixes (Includes shifting realities and more)
2021-06-09 11:12:23 -07:00
SandPoot
00bb96d467
upload soulstone.dm
2021-06-08 12:32:12 -03:00
zeroisthebiggay
536135ec02
last bit of finetuning
2021-06-08 01:17:10 -04:00
zeroisthebiggay
55075fb31b
Update revenant.dm
2021-06-08 01:15:03 -04:00
zeroisthebiggay
538f1c802d
Update revenant.dm
2021-06-08 01:13:12 -04:00
silicons
1a800cc470
modifications
2021-06-07 19:40:16 -07:00
silicons
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
keronshb
70926f5daf
Merge remote-tracking branch 'upstream/master' into floorcluwneport
2021-05-31 22:21:34 -04:00
silicons
cb52be5dd9
fixes linter warnings ( #14778 )
...
* woo
* woo
2021-05-31 10:19:20 -05:00
silicons
caa2dbeefd
Update slaughter.dm
2021-05-28 05:51:21 -07:00
silicons
7c1b8ee07d
Merge pull request #14757 from Kraseo/no-bloodcrawlies
...
fixes being able to slam into people while bloodcrawled as slaughter demon
2021-05-28 06:50:19 -06:00
Linzolle
ed86a6628a
THIS SHOULD REALLY BE THE OTHER WAY AROUND
2021-05-27 19:53:55 -05:00
Linzolle
46833abf0b
add cult_permitted area flag
2021-05-27 19:34:00 -05:00
keronshb
e0a1e50927
Fixes the linter
2021-05-27 13:25:27 -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
Kraseo
c3bfbac89a
this time for real
2021-05-26 01:43:45 +02:00
Kraseo
7173bfade5
this is why i don't do webedits
2021-05-26 00:35:49 +02:00
Kraseo
3b5f391843
Merge branch 'master' into no-bloodcrawlies
2021-05-26 00:29:20 +02:00
Kraseo
7e2e608784
fixes slamming people into walls and such while bloodcrawled
...
no
2021-05-26 00:23:11 +02:00
zerothebigboy
36fe3fef76
abuse
2021-05-24 21:40:15 -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
Lin
67ea47998c
Merge pull request #14738 from Putnam3145/fix-activity-again
...
Makes antags actually get activity properly
2021-05-20 13:33:51 -05:00
keronshb
538efd2d8f
Alt Click and Alt Click message
2021-05-19 20:01:11 -04:00
keronshb
88dc0821d1
User gibs when being turned into a spess dragon
2021-05-19 19:49:48 -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
keronshb
f4780d4b5a
Correct Raw Prophet recipe
2021-05-19 11:19:12 -04:00
keronshb
547b3d0a0b
TP finally works
2021-05-19 11:15:48 -04:00
keronshb
b8b25662ff
Couple of fixes, almost ready to go
2021-05-18 22:12:02 -04:00
Putnam
fc31453587
Makes antags actually get activity properly
2021-05-18 16:27:07 -07:00
Putnam
030361e1cc
suggestions
2021-05-18 16:18:57 -07:00
keronshb
d2f69acaf8
Space Dragon Event
...
Ports the Space Dragon event
2021-05-18 12:06:32 -04:00
qweq12yt
9dd372ed11
fix void cloak going to the void
2021-05-17 17:33:23 -03: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
keronshb
ef470a3baf
Fixes Void Robes for Digi legs
2021-05-13 13:37:35 -04:00
keronshb
611dca2776
New Line at End of file
2021-05-12 17:04:10 -04:00
Putnam
1a92973d99
Antag/species quirk blacklist fix
2021-05-12 10:18:52 -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
c5f13c44a8
Merge pull request #14708 from qweq12yt/misc-fixes
...
[Fix] Bugs are BAD!
2021-05-12 04:42:22 -06:00
