Commit Graph
46152 Commits
Author SHA1 Message Date
LinandGitHub 2a884f4e01 Merge pull request #15578 from SandPoot/fix-weird-diagonal
Fixes pathfinding not checking diagonal passability properly.
2022-04-02 07:17:02 +00:00
Changelogs 55a9d8ddb9 Automatic changelog compile [ci skip] 2022-04-01 00:43:16 +00:00
CitadelStationBot 6663744212 Automatic changelog generation for PR #15304 [ci skip] 2022-03-30 22:06:03 -05:00
3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-03-30 20:06:00 -07:00
SandPoot 06528b61ae Update files 2022-03-30 22:32:58 -03:00
CitadelStationBot 9d6ec35125 Automatic changelog generation for PR #15574 [ci skip] 2022-03-30 20:09:38 -05:00
LinandGitHub de15958ad5 Merge pull request #15574 from TripleShades/cams
Large Fix and Adjustment Batch (Cams, Pipes, Lightswitches)
2022-03-31 01:09:36 +00:00
siliconsandGitHub bfbba7cb06 blocks investigate log access without R_SENSITIVE (#15573)
* Update admin_verbs.dm

* Update admin_verbs.dm

* Update sql_message_system.dm
2022-03-30 12:42:05 -07:00
TripleShades 7b270dd4f0 wait go back 2022-03-29 02:22:00 -04:00
TripleShades af197ce22e lizard man points local mapper at the debug tools
local mapper goes FUCKING BONKERS
2022-03-29 02:12:32 -04:00
Changelogs f6a78bbf83 Automatic changelog compile [ci skip] 2022-03-28 00:38:28 +00:00
CitadelStationBot c6cc85d991 Automatic changelog generation for PR #15572 [ci skip] 2022-03-27 01:24:56 -05:00
siliconsandGitHub be93516675 Merge pull request #15572 from Arturlang/compilerWarningFixes
Fixes the compile warnings
2022-03-26 23:24:53 -07:00
Changelogs dcb8712619 Automatic changelog compile [ci skip] 2022-03-25 00:38:49 +00:00
CitadelStationBot 8c13f17d69 Automatic changelog generation for PR #15570 [ci skip] 2022-03-24 16:39:05 -05:00
LinandGitHub dbb2db5cc1 Merge pull request #15570 from bunny232/Oral
Climax with partner now counts mouth
2022-03-24 21:39:02 +00:00
CitadelStationBot 8985c02c1e Automatic changelog generation for PR #15571 [ci skip] 2022-03-24 16:38:20 -05:00
LinandGitHub 46249b731c Merge pull request #15571 from DeltaFire15/self-fueling-welder-fix
Fixes self-fueling welder refueling in edge cases
2022-03-24 21:38:17 +00:00
Artur 1caa8233b8 Fixes the compile warnings 2022-03-24 13:04:55 +02: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
DeltaFire 4355202975 empty commit to fix icondiffrenders 2022-03-23 04:31:56 +01:00
Changelogs 1d61bd48ac Automatic changelog compile [ci skip] 2022-03-23 00:42:57 +00:00
DeltaFire a8ff45ca16 fix 2022-03-22 18:05:58 +01:00
CitadelStationBot c18f0573de Automatic changelog generation for PR #15497 [ci skip] 2022-03-22 11:24:51 -05: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
CitadelStationBot 735ca5dbe5 Automatic changelog generation for PR #15438 [ci skip] 2022-03-21 20:56:49 -05: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
CitadelStationBot 0b70ef1e7c Automatic changelog generation for PR #15568 [ci skip] 2022-03-21 20:55:25 -05:00
LinandGitHub a8a9663832 Merge pull request #15568 from TripleShades/delda
Omega Tcomms and Gravgen Pipes
2022-03-22 01:55:22 +00:00
Changelogs cbd1eca905 Automatic changelog compile [ci skip] 2022-03-22 00:37:49 +00:00
CitadelStationBot f2395b0e06 Automatic changelog generation for PR #15566 [ci skip] 2022-03-20 22:37:51 -05:00
LinandGitHub f96c2be570 Merge pull request #15566 from bunny232/master
Meta customs wire
2022-03-21 03:37:48 +00:00
Changelogs 3e35a8b1c0 Automatic changelog compile [ci skip] 2022-03-21 00:36:16 +00:00
CitadelStationBot 267f435c5a Automatic changelog generation for PR #15564 [ci skip] 2022-03-20 17:30:37 -05: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
TripleShades 80bdb7b540 Update OmegaStation.dmm 2022-03-20 17:19:01 -04:00
evan 739c4708b6 Hey what if no dead ends 2022-03-19 19:04:25 -04:00
bunny232andGitHub 8720ea934d Merge pull request #1 from Citadel-Station-13/master
aeughupdoot
2022-03-19 19:01:42 -04:00
Changelogs 1efe80dfed Automatic changelog compile [ci skip] 2022-03-19 00:36:19 +00:00
CitadelStationBot c23c4a7624 Automatic changelog generation for PR #15561 [ci skip] 2022-03-18 16:15:25 -05:00
siliconsandGitHub cc9c22b1e4 Merge pull request #15561 from TripleShades/omegaaaaa
Omega Air Mixer + Turbine Wire
2022-03-18 14:15:22 -07:00
TripleShades 90d1025fbb Update OmegaStation.dmm 2022-03-18 16:56:04 -04:00
SandPoot 3ee2d12b34 Upload files 2022-03-18 12:45:07 -03:00
TripleShades bcf5be78f0 Update OmegaStation.dmm 2022-03-18 01:12:00 -04:00
TripleShades f01338c0e7 Update OmegaStation.dmm 2022-03-18 01:06:43 -04:00
TripleShades 90c42624b3 Update OmegaStation.dmm 2022-03-18 00:56:17 -04:00
TripleShades 164c483796 Update OmegaStation.dmm 2022-03-18 00:53:09 -04:00
Changelogs fe59c7c2be Automatic changelog compile [ci skip] 2022-03-18 00:37:38 +00:00
CitadelStationBot 043f6ddf5e Automatic changelog generation for PR #15559 [ci skip] 2022-03-17 19:00:29 -05:00