5378 Commits
Author SHA1 Message Date
quotefox 20d4541541 lips and lip fleshlights 2022-09-09 23:38:37 +01:00
DahlularandGitHub ebcb2c14d7 Merge pull request #1671 from SquishyRolls/Labcoat
Labcoat in loadout
2022-09-09 09:40:01 -06:00
SquishyRolls 2eb8da04b4 Labcoat in loadout
Labcoat is now in loadout cus I willed it to be so.
2022-09-09 16:28:15 +01:00
DahlularandGitHub 52d8faac25 Merge pull request #1670 from ToonClyde/New-Kenk-plushy-textures
New kenk plushies and map fixes
2022-09-09 03:38:23 -06:00
ToonClyde 74e9f4ba43 New kenk plushies and map fixes 2022-09-09 01:53:48 -07:00
DahlularandGitHub b677ca1125 Merge pull request #1669 from Dahlular/bigmistakes
Ports the Claw from LC13
2022-09-09 00:03:26 -06:00
DahlularandGitHub 4b9e57153c Merge pull request #1668 from CydiaButt13/mothalpha
Fixes some emotes, adds some I missed
2022-09-08 23:49:04 -06:00
Dahlular 9d9ee225a6 ports the Claw from LC13
why the fuck did I do this, this was a mistake.
2022-09-08 23:41:43 -06:00
Lasshy KorshBot 6ee0074f74 Fixes some emotes, adds some I missed
haha don't look at line 452 - 467 in cit_emotes that never happened
2022-09-08 23:03:25 -05:00
DahlularandGitHub 3f7dde1b68 Merge pull request #1667 from ArchieBeepBoop/ourtableitsbroken
[s] Table Easter Egg
2022-09-08 21:24:54 -06:00
Archie 544604ee21 it is done. 2022-09-09 00:10:26 -03:00
quotefox ca065b7711 plane fix
plane fix
2022-09-09 02:44:14 +01:00
quotefox 142d161d6b Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2022-09-09 02:38:01 +01:00
quotefox 12dc5cff4c fix stairs layer and sprites 2022-09-09 02:37:54 +01:00
QuoteFoxandGitHub 66f92c930a Merge pull request #1666 from haha26315/Overboard;-Railings-Update
Railings fix v2, electric boogaloo
2022-09-09 02:24:47 +01:00
Haha26315 8a65924446 Railing + hulk = bad
Should handle a possible exception if a railing is hit by a hulk player.
2022-09-08 21:22:53 -04:00
quotefox a205b47acb Barber fixes do_mob() 2022-09-09 02:21:16 +01:00
Haha26315 732f1c18f7 Fix version 2, electrification boogaloo
Fixes the ability to climb railings by removing the forcemove call that teleports players and instead refactoring the do_climb and climb_structure procedures in structure code itself.
Uses a similar method to tables of briefly turning collision off for the railing when the object is climbed in order to let players climb it, without moving the player into otherwise occupied space.
2022-09-08 21:19:45 -04:00
quotefox c11dd11cbb Scissors now show progress bar properly. 2022-09-09 02:17:05 +01:00
QuoteFoxandGitHub 783032d3be Merge pull request #1665 from ArchieBeepBoop/funnydrainpoolkillingtheserver
fixes over 47 thousand roundstart active turfs
2022-09-09 01:36:36 +01:00
Archie 6ad8bf647e fixes over 47 thousand roundstart active turfs 2022-09-08 21:16:54 -03:00
quotefox e960c5f3fa Buttons to change Z level as a ghost 2022-09-09 00:54:18 +01:00
Haha26315 f5ca97971f Railing Climbing Fix
Fixes the ability to climb railings by removing the forcemove call that teleports players and instead refactoring the do_climb and climb_structure procedures in structure code itself.
2022-09-08 19:39:52 -04:00
QuoteFoxandGitHub 9186412461 Merge pull request #1664 from ArchieBeepBoop/funnydrainpoolkillingtheserver
Removes pool drains from showers
2022-09-09 00:20:00 +01:00
quotefox b117e9abf7 fix arousal from disappearing 2022-09-08 23:46:25 +01:00
Archie 652c8689f2 Removes pool drains from showers 2022-09-08 13:47:03 -03:00
QuoteFoxandGitHub 29794ae789 Merge pull request #1655 from CydiaButt13/mothalpha
Shit ton of emotes, and I fixed one, too.
2022-09-08 17:31:45 +01:00
QuoteFoxandGitHub 06da955673 Merge pull request #1663 from ArchieBeepBoop/minimapfix
Port: Citadel's Minimap Refresh (Multi-Z aware and pixel perfect)
2022-09-08 17:31:20 +01:00
deathride58andArchie 5f8b4fbc0f Port: minimap refresh - high-detail, JS fixes, pixel-perfect scaling, and more! 2022-09-08 13:20:22 -03:00
DahlularandGitHub 1436afabe7 Merge pull request #1662 from haha26315/Overboard;-Railings-Update
Constructing Railings
2022-09-08 02:21:48 -06:00
DahlularandGitHub 753a360a5b Merge pull request #1661 from ToonClyde/new-Map-fixes
Some more new map fixes
2022-09-08 02:19:11 -06:00
Haha26315 52cce9fbce Constructing Railings
Allow players to construct railings of their very own, unfasten them from the flooring, deconstruct them including with RCDs, and all the good stuff from grilles, like electrification. Also solves the bug whereby you could climb over railings into solid tiles.
2022-09-07 23:36:07 -04:00
ToonClyde 3c74f414d6 Some more new map fixes 2022-09-07 20:11:13 -07:00
DahlularandGitHub 98f9b26d1e Merge pull request #1660 from haha26315/Overboard;-Railings-Update
Overboard; Railings Update
2022-09-07 16:26:33 -06:00
DahlularandGitHub b1c7584328 Merge pull request #1659 from ToonClyde/Small-map-tweaks
Small map tweaks
2022-09-07 16:26:02 -06:00
quotefox 6d31153266 Revert "fox hair for marilyn"
This reverts commit 1d65c43763.
2022-09-07 23:22:13 +01:00
Haha26315 e5a6425321 Overboard; Railings Update
Allows players to circumvent railings by use of wings, jump boots, or being thrown by other players or by disposals systems, etc. Throwing, be it items or players, has the same chance of failure as throwing something into a disposals bin of 25%.
2022-09-07 18:16:45 -04:00
ToonClyde 0bdc2b44ed test 2022-09-07 15:11:10 -07:00
ToonClyde 0fa89dd2f8 Merge remote-tracking branch 'upstream/master' 2022-09-07 13:33:41 -07:00
DahlularandGitHub a37de474c4 Merge pull request #1658 from Dahlular/morefixes
More MultiZ fixes
2022-09-07 14:13:49 -06:00
Dahlular cf6ab729fe fixes an APC, air alarm, and missing lights 2022-09-07 14:10:37 -06:00
DahlularandGitHub 027f9d8c92 Merge pull request #1657 from Dahlular/second-warning
Ports green Ordeal mobs from LC13
2022-09-06 18:26:15 -06:00
Dahlular 3245c4a52e Ports green Ordeal mobs from LC13 2022-09-06 18:21:02 -06:00
DahlularandGitHub 86d2f933a8 Merge pull request #1656 from Dahlular/lambentupdates
Map Updates and Coping With Actions
2022-09-06 15:42:46 -06:00
Dahlular 671e01b073 I HATE ACTIONS IM USING SPELLS NEXT TIME 2022-09-06 15:39:45 -06:00
Dahlular bc9bd3c53f putting this aside, map fixes 2022-09-06 15:08:52 -06:00
Lasshy KorshBot 1df848bc4a Shit ton of emotes, and I fixed one, too.
Don't ask me about those arcs.
2022-09-05 20:28:37 -05:00
Dahlular d716d437d2 I'll finish this later 2022-09-05 19:16:47 -06:00
DahlularandGitHub 82647e288d Merge pull request #1654 from SquishyRolls/DMI-FIX
Stacey's Wumbo DMI Fix PR
2022-09-05 14:19:53 -06:00
Moltov bdbff7a90a Im helping
removed applyinateeffects, after_spawn grants dash instead. Dash is not working,
2022-09-05 14:24:50 -04:00