Commit Graph
215 Commits
Author SHA1 Message Date
SandPoot 8ae64b1bd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-29 19:16:50 -03:00
SandPoot 54641ce201 send 2023-01-23 20:44:28 -03:00
SandPoot 011dd2e817 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-16 16:47:19 -03:00
Timothy Teakettle b4330b2f3d GOODBYE SPECIES, HELLO COMPONENT 2022-08-05 18:19:22 +01:00
SandPoot 8e71dbe371 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-24 15:07:34 -03:00
SandPoot 329e160a1f /BiologicalLife(delta_time... 2022-07-20 21:40:53 -03:00
SandPoot 25deceb75f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-19 23:02:20 -03:00
IHOPMommyLich 669ce698e0 Update dynamic.dm 2022-06-15 21:02:32 -04:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03: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
Solaris-ShadeandGitHub 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
SandPoot 7a2cc5ddfa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-10 22:03:11 -03:00
Putnam3145 062da9bb05 fixed dynamic days (lowertext) 2022-03-06 13:18:59 -08: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 fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
siliconsandGitHub bf9afd846d Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system
[PORT] Removes the non bitflag slot defines
2022-02-26 18:08:28 -07:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
Putnam3145 3b1304f432 Weekly dynamic days 2022-02-02 17:38:19 -08:00
SandPoot e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -03:00
SandPootandGitHub 0031ee81db Updates runechat adding languages to it (#219) 2022-01-12 17:13:48 -03:00
LetterN fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
DeltaFire f0ff064dc1 missed a line 2021-12-08 05:12:32 +01:00
DeltaFire 04797a961b linters b gone 2021-12-08 05:07:22 +01:00
keronshb 146ada0d3d Removes anchored from jacq 2021-11-20 23:54:16 -05:00
LetterN 8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
keronshb af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -05:00
LinandGitHub efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
LetterN 8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
keronshb efd12e4fd5 Changes for merge 2021-11-01 12:07:44 -04:00
silicons 186b552103 merge 2021-10-29 21:50:58 -07:00
LetterN a057139c33 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-10-30 11:54:20 +08:00
LetterN 99019166e4 i think it works
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
siliconsandGitHub 319c5e23fe Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not
Revert "TGUI alerts, lists, inputs"
2021-10-29 20:27:46 -07:00
LinandGitHub 5054ea87ce Merge pull request #15310 from keronshb/jaqincinerator
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
2021-10-28 21:29:50 -07:00
keronshb b2a890269a Fixes destroy 2021-10-28 15:44:08 -04:00
keronshb 29a39ed9ea Indestructable change 2021-10-28 15:30:00 -04:00
keronshb 468b4a11ff More buffs 2021-10-28 11:26:18 -04:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
keronshb 1b38913867 Some linter fixes 2021-10-16 15:28:41 -04:00
keronshb df0e95885e Minor fixes 2021-10-16 01:43:42 -04:00
keronshb 3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
LetterN 6739e349a0 heretics LOVES this - Also ian's birthday! 2021-09-08 09:50:07 +08:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
siliconsandGitHub 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
siliconsandGitHub 1585afa1ef Update jacqueen.dm 2021-02-20 20:55:31 -07:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
The0bserver ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00