Commit Graph
860 Commits
Author SHA1 Message Date
Aypa e837ea991e Merge branch 'master' into esthetic-help 2022-08-14 16:54:21 -03:00
WoolyAypa df7fae30c1 fuck it, colorful angel wings! >:) 2022-08-13 23:12:58 -03:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
SandPoot 00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03:00
Putnam3145 b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
BongaTheProto 375c0f2634 Merge branch 'master' into pr/359 2022-06-16 16:43:41 -05:00
BongaTheProto 03f4c65fc4 Merge remote-tracking branch 'upstream/master' 2022-06-11 23:25:29 -05:00
SandPoot 07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03:00
deathride58 512a8c783c basic code cleanup and limits 2022-06-09 23:37:49 -04:00
deathride58 f30c9406cc randomization! 2022-06-09 15:29:48 -04:00
BongaTheProto 6d385f2b2e Merge remote-tracking branch 'upstream/master' 2022-06-07 19:10:13 -05:00
SandPoot be1357bdb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:29:38 -03:00
LinandGitHub 6f97ec2b1d Merge pull request #15656 from deathride58/animfix
Animation refresh - Fully restores animations broken by BYOND updates, some light animation-related tweaks, and more
2022-06-07 18:05:07 +00:00
deathride58 dac4e9b974 fixes ghost pixel z not resetting on orbit stop 2022-06-05 18:01:15 -04:00
BongaTheProto 488e0a295f You mfs can't be pleased
makes the new menu a toggle
2022-06-05 14:58:49 -05:00
YatiyayaandGitHub 30f563f227 Merge branch 'SPLURT-Station:master' into Zombie-unfuckery 2022-06-05 12:25:10 -04:00
BongaTheProto ec12aeaabf Merge remote-tracking branch 'upstream/master' 2022-06-05 02:00:30 -05:00
SandPoot 6bff4b4165 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-05 01:38:42 -03:00
Bangus 460eb75f5a Bunch'a changes and additions. General improvements 2022-06-04 01:04:09 -04:00
Bangus fecb5fa63b Updating the zombie race to support modular creation between anthro mammal/insect races since the current high-functioning zombie is a defunct halloween species from years ago. 2022-06-02 01:25:04 -04:00
deathride58 1a918ed8db animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game 2022-05-31 19:22:30 -04:00
deathride58 c5e0048efd oops - forgot to completely undo the de-fanging i did for testing! 2022-05-30 22:10:37 -04:00
deathride58 ee92230176 Moves newplayer button population to a dedicated proc, significantly reducing the hackiness involved for getting the agegate working proper 2022-05-30 22:08:49 -04:00
SandPoot 8bb1c2b32a Upload files 2022-05-30 01:31:54 -03:00
Putnam3145 33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
Iosyf 48c6512971 ignore this
better descriptor
2022-04-23 22:36:29 +03:00
Iosyf 847472486d Runtime Ironing out (mostly null checks)
checking for nulls in:
flavor_text.dm
new_player.dm
coiling.dm
tgyu,dm
lewd_shoes.dm
storage.dm
milking_machine.dm - for some reason tried calling /obj/effect/decal/cleanable/semen/getorganslot() (line 81)
2022-04-23 19:47:52 +03:00
BongaTheProto 479b497b00 ok 2022-04-19 01:30:44 -05:00
AManWithAToolbox dda0869f82 Merge branch 'pr/1' into its-wasnt-gonna-happen 2022-04-18 23:19:18 -05:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
nullfag 65f87e3e05 "clients dissapear at literally any moment" 2022-04-17 01:30:19 +02:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
siliconsandGitHub 73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs
Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot 9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145 6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
SandPootandGitHub e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
Solaris-ShadeandGitHub 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
BongaTheProtoandGitHub 28778e7aa9 Merge branch 'Sandstorm-Station:master' into master 2022-03-01 17:19:50 -06:00
SandPoot 0fa5987105 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-01 14:06:17 -03:00
Timothy TeakettleandGitHub 778bf1777b fixes coiling issue (#15530)
* why

* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant

* fix

* Update preferences.dm

* no slimes you're not allowed the hidden sprite
2022-02-28 14:01:57 -08:00
BongaTheProto 2ac1138ac1 Merge remote-tracking branch 'upstream/master' 2022-02-24 23:05:13 -05:00
SandPoot 598dcc5828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-24 13:44:22 -03:00
Timothy TeakettleandGitHub f6b9858f4f adds snake coiling (#15514)
* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant
2022-02-23 22:01:13 -07:00
BongaTheProto d1eafd39a4 Merge remote-tracking branch 'upstream/master' 2022-02-20 19:41:46 -05:00
SandPoot f3ba281d78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-20 21:18:57 -03:00
LinandGitHub 1adbf914c2 Merge pull request #15414 from BlueWildrose/wingport
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
2022-02-21 00:02:21 +00:00