Commit Graph
29839 Commits
Author SHA1 Message Date
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot d8f656ecf1 restores EMP behavior 2022-03-23 10:26:58 -03:00
554c38fedf Update code/modules/arousal/arousal.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2022-03-23 05:28:24 -04:00
Solaris-ShadeandGitHub 5596b04f5c Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-22 20:37:16 -04:00
SandPootandGitHub e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
DeltaFire a8ff45ca16 fix 2022-03-22 18:05:58 +01:00
BlueWildroseandGitHub ac1c3511b1 Advanced mutation toxin nerf; new cure, removes instant subspecies transformation (#15497)
* Advanced mutation toxin nerf

* Adv Mut Toxin nerf fix - needs all cures to FALSE
2022-03-22 17:17:18 +01:00
evan 8ddf825aa8 Update arousal.dm 2022-03-22 01:22:54 -04:00
siliconsandGitHub ff6ed43bc1 Merge pull request #15438 from LiteralMushroom/patch-5
Makes it so alter form can affect eyes.
2022-03-21 18:56:47 -07:00
Solaris-ShadeandGitHub fb4e27e536 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-21 17:21:14 -04:00
LinandGitHub 22a49c1dd7 Merge pull request #15564 from SandPoot/bad-getatomonturf
Fixes balloon alerts sourced on turfs
2022-03-20 22:30:34 +00:00
Solaris-ShadeandGitHub d9ff37d2ff Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-19 11:23:16 -04:00
SandPoot 11daaadf79 arguments. 2022-03-18 18:43:40 -03:00
SandPoot 16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot 3ee2d12b34 Upload files 2022-03-18 12:45:07 -03:00
SandPootandGitHub 96e38e965b Merge branch 'master' into mechs-are-vehicles 2022-03-17 22:23:48 -03:00
LinandGitHub ec380ce26b Merge pull request #15559 from SandPoot/logging-runtimes
Solves some LOG_VICTIM issues
2022-03-18 00:00:25 +00:00
LinandGitHub f2896f3afb Merge pull request #15556 from Citadel-Station-13/silicons-patch-1
fixes parallax trying to make null objects
2022-03-17 06:23:40 +00:00
SandPoot 4da5a57688 global 2022-03-16 18:33:32 -03:00
SandPoot 11522b7761 global var 2022-03-16 18:21:37 -03:00
SandPootandGitHub 25bcad7be8 Update code/datums/components/armor_plate.dm 2022-03-16 18:06:25 -03:00
SandPoot baee52349b Upload files 2022-03-16 15:41:07 -03:00
SandPoot 37fef7fbba Upload files 2022-03-16 15:33:31 -03:00
SandPoot fdb6413d23 You guys want some logs? 2022-03-16 15:22:04 -03:00
SandPoot aec888a7b6 Update files 2022-03-16 15:17:57 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
LinandGitHub c0da155ad5 Merge pull request #15553 from Putnam3145/fix-explosive-compressor
Fix implosion compressor impossibility
2022-03-15 19:24:17 +00:00
siliconsandGitHub 6f8fc5125d Update space.dm 2022-03-15 10:24:46 -07:00
LinandGitHub c25e074128 Merge pull request #15547 from Putnam3145/extend-min-pop
Adds a minimum vote count to continue rounds
2022-03-14 18:48:11 +00:00
LinandGitHub e819fbdb83 Merge pull request #15546 from Putnam3145/fix-supermatter-exploit
Makes supermatter take damage (and not heal) if too near to spaced turfs
2022-03-14 18:47:09 +00:00
Putnam3145 b597675ef4 Fix explosive compressor impossibility 2022-03-14 11:41:20 -07:00
LinandGitHub 99e7249a11 Merge pull request #15550 from Putnam3145/fix_should_equalize
Makes should_do_equalization actually work
2022-03-14 02:09:03 +00:00
siliconsandGitHub 861a9f854f Merge pull request #15476 from DeltaFire15/core-alt-pr
Buffs regen core healing for robots on lavaland, nerfs regen cores when not on lavaland
2022-03-13 14:26:06 -07:00
siliconsandGitHub fcfde73f5e Merge pull request #15425 from DeltaFire15/slower-organ-healing
Nerfs* passive organ healing, plus some minor stuff
2022-03-13 14:26:00 -07:00
siliconsandGitHub a3284a0923 Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
Weakens chemistry's revival chems
2022-03-13 14:24:57 -07:00
DeltaFireandGitHub cb1848d06c no more free money (#15375) 2022-03-13 12:50:30 -07:00
Putnam3145 32803f1cd1 Makes should_do_equalization actually work 2022-03-12 13:54:18 -08:00
Solaris-ShadeandGitHub 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade a478945424 Merge conflict one 2022-03-11 22:49:16 -05:00
Solaris-Shade 171bd18c8a Updated Projectile code some more. 2022-03-11 22:23:01 -05:00
Putnam3145 4e2b8949fa it is important that we actually keep track 2022-03-10 21:47:21 -08:00
Putnam3145 857253a07b who names a var T. 2022-03-10 21:42:27 -08:00
Putnam3145 2abe8f1ed6 Actually, no, just a minimum extend vote count 2022-03-10 21:38:39 -08:00
Putnam3145 9b4c3a5be3 Adds a minimum greater vote count to extend rounds 2022-03-10 21:35:08 -08:00
siliconsandGitHub 4cd8753a23 Merge pull request #15543 from timothyteakettle/floor-tile-moment
spraypainting a stack of floor tiles makes the placed tile the same colour!
2022-03-10 16:51:18 -07:00
siliconsandGitHub 2a5a79f751 Merge pull request #15536 from SandPoot/JPS
Implements JPS (Jump Point Search) Pathfinding
2022-03-10 16:51:07 -07:00
siliconsandGitHub cdefa4f64a Merge pull request #15535 from SandPoot/statpanel
Statpanel update
2022-03-10 16:50:59 -07:00
siliconsandGitHub b1ba1d60f0 Merge pull request #15534 from SandPoot/screentips
Screentips
2022-03-10 16:50:28 -07:00
siliconsandGitHub 234b3eae8f Merge pull request #15540 from Citadel-Station-13/more-tritium-enthalpy
Adds a LOT more enthalpy to tritium
2022-03-10 16:47:15 -07:00
Putnam3145 a44d0af4dc hackish supermatter dying on spaced nearby turfs 2022-03-09 07:49:02 -08:00