Commit Graph

2104 Commits

Author SHA1 Message Date
Dan-Neposh
274269c2b8 surely my code works every time 2022-10-19 01:32:34 -04:00
Dan-Neposh
a447d337a8 misc balance changes 2022-10-06 00:22:51 -04:00
Putnam3145
c5d1a5f590 sleep tight, disky 2022-08-29 21:35:54 -07:00
Putnam3145
228c637d76 Probably fixes bad stake behavior 2022-08-17 19:19:50 -07: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
Putnam3145
a54fdd1d13 whoops you can check_tick this just fine i think 2022-07-28 17:24:42 -07:00
SandPoot
c2d2a5ebf5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into handle_blood 2022-07-23 18:42:24 -03:00
SandPoot
329e160a1f /BiologicalLife(delta_time... 2022-07-20 21:40:53 -03:00
deathride58
578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04:00
deathride58
020e79fcd6 Lingblood tweak - Increases the default value for ling ability loudness to 0.5 2022-06-14 20:27:24 -04:00
silicons
9a17ef3bf2 Merge pull request #15663 from deathride58/blockquotes
Blockquotes for chat; Prettier examine text and more!
2022-06-10 22:09:12 -07:00
keronshb
d1d7f4eafd Handles 2022-06-10 00:25:32 -04:00
deathride58
04a0a3b869 chat blockquotes; prettier examine text and more! 2022-06-03 18:55:18 -04:00
deathride58
f2aae2e833 Community request x2! 2022-06-02 17:53:24 -04:00
deathride58
5f62b5fa76 You've heard of no cops at pride. Now get ready for... Nukeops at pride 2022-06-02 17:47:33 -04: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
silicons
73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs
Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07:00
silicons
da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload)
Every case of initialize that should have mapload, does
2022-04-15 17:41:57 -07:00
SandPoot
13fb647b9e Update files (#15597) 2022-04-15 16:31:50 +02: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
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -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
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
Solaris-Shade
d9ff37d2ff Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-19 11:23:16 -04:00
SandPoot
96e38e965b Merge branch 'master' into mechs-are-vehicles 2022-03-17 22:23:48 -03:00
SandPoot
baee52349b Upload files 2022-03-16 15:41:07 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-Shade
0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade
171bd18c8a Updated Projectile code some more. 2022-03-11 22:23:01 -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
SandPoot
7bf1bcf857 Some updates 2022-03-05 16:18:17 -03:00
SandPoot
21b68944e7 Upload files 2022-03-05 16:00:12 -03:00
Lin
ae5896d6cf Merge pull request #15525 from keronshb/ambitioncheck
Ambitions from Skyrat
2022-02-27 02:34:13 +00:00
keronshb
681679e675 cleanup 2022-02-25 22:42:27 -05:00
keronshb
1415b9580f Last fixes 2022-02-25 22:29:09 -05:00
SandPoot
f7ea1f377d oops, replace all is a hell of a drug 2022-02-25 17:09:31 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
keronshb
3ea22f97a6 Merge remote-tracking branch 'upstream/master' into ambitioncheck 2022-02-22 17:10:25 -05:00
keronshb
cc249e1e85 Fixes some linter issues 2022-02-11 15:54:03 -05:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
silicons
af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460)
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
2022-02-07 15:17:24 -08:00
Sakura
08b38a7e70 Ashwalker Update (#15466)
* Ashwalker Update

* Update generic_positive_events.dm

* Update ashwalker.dm

* fixing newlines

* Update code/modules/antagonists/_common/antag_datum.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* literally 1984

* unlimiting spawns

* Create antag_datum.dm.bak

* Revert "Create antag_datum.dm.bak"

This reverts commit d91e1f4c4d9c86bc4a275ef19f45e8927dd93cae.

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-02-03 19:34:15 -08:00
silicons
9205545d16 Merge pull request #15317 from LetterN/what-should-i-name-this-branch
TGUI hardsync & stuff
2022-01-25 00:06:59 -08:00
silicons
f601580854 Merge pull request #15430 from DeltaFire15/synth-coolant
Synth stuff : Balancing Nightmare Edition (aka, coolant)
2022-01-22 13:59:12 -08:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
SandPoot
8510dcc08a Ports tgui stripping (finally) (#15401)
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
2021-12-30 07:40:15 +01:00
keronshb
83a62ace04 Ambitioncheck 2021-12-23 21:15:31 -05:00