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
keronshb
ed929dda12
Changes up the animation a bit
2021-06-09 15:12:22 -04:00
silicons
eb4b4088f4
Merge pull request #14760 from keronshb/floorcluwneport
...
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00
silicons
c0e3b8d5ef
Merge pull request #14809 from SandPoot/speak-nice-yes
...
Centralizes borg speech and uses some of the icons for the typing indicator
2021-06-09 11:15:01 -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
SandPoot
b0940456f5
upload files
2021-06-08 13:13:22 -03:00
silicons
b3382a8fe2
local testing time
2021-06-07 16:49:27 -07:00
silicons
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
Putnam
d03bf641dd
extreme optimization project to maybe fix game
2021-06-06 21:58:24 -07:00
silicons
0d206742fa
Update world_topic.dm
2021-06-01 21:35:49 -07:00
silicons
656d0545cd
Update world_topic.dm
2021-06-01 01:32:54 -07:00
keronshb
70926f5daf
Merge remote-tracking branch 'upstream/master' into floorcluwneport
2021-05-31 22:21:34 -04:00
silicons
71db9298a1
Update world_topic.dm
2021-05-28 18:21:46 -07:00
keronshb
c1a9f9cfe9
GLOW ANIMATION
2021-05-28 17:40:43 -04:00
keronshb
86a825bb9f
Space Adapt outline
2021-05-28 15:57:16 -04: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
keronshb
8f1db2d5ec
Fixes some stuff
...
Actually ticks the spell, fixes the brain damage issue, etc.
2021-05-27 12:16:54 -04:00
keronshb
78db6bd5c2
Ports Floor Cluwnes
...
Oh fuck oh god
2021-05-26 21:58:35 -04:00
zerothebigboy
36fe3fef76
abuse
2021-05-24 21:40:15 -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
0dd24d9de9
Update world_topic.dm
2021-05-21 19:35:46 -07: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
silicons
f07d832cad
Update world_topic.dm
2021-05-21 18:20:28 -07:00
silicons
f802890153
Update world_topic.dm
2021-05-16 22:17:50 -07:00
silicons
8ff0685f0d
Update world_topic.dm
2021-05-15 18:28:00 -07:00
keronshb
a6ae645fc2
Space Dragon Fixes ( #55759 )
2021-05-14 12:32:48 -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
silicons
55ee9a00b4
woo yeah woo yeah
2021-05-12 18:24:26 -07:00
silicons
8e2921f3c0
woo
2021-05-12 17:36:01 -07:00
silicons
59f160be57
woo
2021-05-12 16:59:48 -07:00
silicons
2a3a45573f
woo
2021-05-12 16:58:17 -07:00
silicons
6237928c4b
woo
2021-05-12 16:55:21 -07:00
silicons
0b9d021d9b
woo
2021-05-12 16:51:28 -07:00
silicons
482be2ee0d
okay
2021-05-12 16:37:13 -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
3fb84eb1d8
fix
2021-05-12 03:35:02 -07:00
silicons
aeefeb6c53
woo
2021-05-12 03:33:41 -07:00
DeltaFire
0c0e5f6d18
fixes
2021-05-10 17:44:21 +02:00
silicons
4afb5209a1
Merge pull request #14637 from TheObserver-sys/DerringerPass1
...
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
2021-05-07 18:42:24 -06:00
silicons
cb1e2f3730
thing
2021-05-06 02:09:06 -07:00
Artur
35bfba1f6a
Redoes the variable changes into procs
2021-05-05 18:15:13 +03:00
Artur
92e6646a4c
time to make blood even more pain
2021-05-05 14:44:21 +03: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
silicons
4289b8be1e
Merge remote-tracking branch 'citadel/master' into backend_sync
2021-04-28 22:34:17 -07:00
silicons
b108a6fe7e
Merge pull request #14643 from necromanceranne/space_adapt_resprite
...
Changes the space adaptation sprite to something more subtle.
2021-04-28 21:16:51 -06:00
silicons
fefb33454f
do that too
2021-04-28 16:16:55 -07:00
silicons
47489c21d6
Merge remote-tracking branch 'citadel/master' into auxtools-atmos
2021-04-27 00:59:45 -07:00
silicons
8fe45263c5
whew
2021-04-26 22:58:30 -07:00
silicons
7ccb5bc711
fixes
2021-04-26 14:21:59 -07:00
silicons
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
