Commit Graph

606 Commits

Author SHA1 Message Date
Vladin 479c003c97 Do not fuck the bird.
Kenk plush can no longer be sex'd, as per his request.
2021-01-26 23:43:51 -05:00
QuoteFox 0057c577ed Revert "Merge pull request #924 from MalricB/sus"
This reverts commit 85f3bb35c9, reversing
changes made to 667aa686c1.
2021-01-26 17:58:36 +00:00
QuoteFox 586ed7c46c Revert "Merge pull request #926 from MalricB/sus"
This reverts commit cbc7993239, reversing
changes made to c453ed509f.
2021-01-26 17:52:14 +00:00
QuoteFox cbc7993239 Merge pull request #926 from MalricB/sus
(E)Rp is now legal
2021-01-26 14:30:45 +00:00
CygnusB 086debf760 Update emergency_button.dm 2021-01-26 11:26:49 -03:00
QuoteFox 85f3bb35c9 Merge pull request #924 from MalricB/sus
!! Emergency Staff Meeting !!
2021-01-26 11:56:12 +00:00
CygnusB 5c55fd0c08 quotefox kinda sus ngl 2021-01-25 23:55:20 -03:00
Kabra_men 41c87b5e85 more wood stuff 2021-01-25 17:37:06 -03:00
QuoteFox a45877dbfe divders for doors
just alittle sprite overlay to help define doors.
2021-01-23 11:19:25 +00:00
QuoteFox 3566f1c9a6 fixed chair padding on shuttle chairs.
fixed chair padding on shuttle chairs.
2021-01-23 10:55:32 +00:00
Kabra_men 3e6fb7b5e8 TREES 2021-01-22 20:45:16 -03:00
QuoteFox 47f974d8dd Merge pull request #918 from Kabramen/new-wood-types
New wood types + lavaland red grass
2021-01-22 08:45:11 +00:00
Kabra_men cd9fb045e1 GRASS 2021-01-21 12:02:42 -03:00
QuoteFox 0a61a40231 fixes
fixes
2021-01-21 14:46:31 +00:00
QuoteFox a1729c008c Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-01-21 14:24:58 +00:00
QuoteFox 867855f6f7 Fixes to doors and RCD now can print ANY door colour
Fixes to doors and RCD now can print ANY door colour
2021-01-21 14:24:55 +00:00
QuoteFox 351c9b52d2 Merge pull request #914 from ArchieBeepBoop/hatfix
To the town of agua fria rode a stranger one fine day (Fixes hat throwing)
2021-01-21 14:20:12 +00:00
QuoteFox cba5255206 Modular doors
Modular doors
2021-01-21 11:10:54 +00:00
Kabra_men 6c0a7b1b39 WOOD 2021-01-21 03:09:52 -03:00
Archie f22a21f8cb Revert "Merge pull request #910 from quotefox/revert-905-AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER"
This reverts commit 3c0c4c41a1, reversing
changes made to e79656c1ba.
2021-01-21 03:07:29 -03:00
Archie ec28d0f66d Line ending conflict fix 2021-01-21 02:45:10 -03:00
nik707 858f994b5d Adds: The Chad Plasmaglass Table 2021-01-21 02:44:06 -03:00
QuoteFox 90c7aa539a Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-01-21 01:22:54 +00:00
QuoteFox 75eb4d5696 New chairs and recipes!
New chairs and recipes!
2021-01-21 01:20:12 +00:00
Dahlular 893bd14014 Revert "ports hat throwing" 2021-01-20 09:20:55 -07:00
QuoteFox e79656c1ba Merge pull request #905 from MalricB/AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER
ports hat throwing
2021-01-20 13:04:18 +00:00
CygnusB edf030d4b7 YEEHAWPARTDNERSYES
YEAAHHFDG
2021-01-19 18:28:13 -03:00
Archie ec3a68dc7a Runtime man bad 2021-01-19 18:09:23 -03:00
CygnusB 520e075e39 Update secure.dm 2021-01-19 06:42:01 -03:00
CygnusB 8ece699ed9 Merge branch 'master' into punishesarchie 2021-01-19 06:30:10 -03:00
CygnusB 958b01f4d0 part 2
forgot a bunch of shit, also had to re-do parts because we don't have update_overlays()
2021-01-19 06:09:55 -03:00
CygnusB f21db73775 fuck yeah
banana
2021-01-19 03:31:33 -03:00
Dahlular 9f0b22fa95 Code Cleanup + Cushions 2021-01-18 01:14:58 -07:00
QuoteFox 09b109c00b lighter sound effects
as a smoker, I know the sound of the lighter is very important. (also removed Some WOW cool text)
2021-01-17 11:49:12 +00:00
QuoteFox 238be29c48 im sick of it, your sick of it. ITS GONE
im sick of it, your sick of it. ITS GONE
2021-01-17 11:29:46 +00:00
QuoteFox f806ffd48b Merge pull request #891 from ArchieBeepBoop/cargo5
Small cargo crate revamp + QoL changes
2021-01-17 08:46:25 +00:00
kevinz000 7264218dca Alien Furniture 2021-01-16 22:57:45 -03:00
Archie 3fa4bf8007 Allows borgs and drones to interact with tank dispensers 2021-01-16 18:38:45 -03:00
Archie 12fde70d0c Cargo Changes Initial 2021-01-16 17:40:43 -03:00
Archie 41540397db Fixes a bunch of fallout 2021-01-16 16:12:38 -03:00
Chloe Carver-Brown b49dc9536a Adds footwraps as a roundstart and craftable shoe 2021-01-16 02:49:23 +00:00
QuoteFox 6dffcff818 Merge pull request #877 from Chemlight/Implants-and-maybe-some-cargo
Lots of bus implants and ATV supply n' demand
2021-01-15 18:32:32 +00:00
QuoteFox 83567cf685 Ports techweb backend refactor & co.
from https://github.com/Citadel-Station-13/Citadel-Station-13/pull/9737
2021-01-15 18:28:36 +00:00
Chemlight 403f4336db Lotsa bus implants and ATV supply n' demand
Since Krav maga has an implant to toggle it on and on, I thought lets add everything else! (Aside from boxing, that for example is just tied to boxing gloves).

Also ATV's are too easy to get, make it need effort to buy and become speed racer.
2021-01-15 04:25:16 -08:00
Archie 3d46b689ac Fix EOL issues 2021-01-14 14:54:39 -03:00
kevinz000 b5fe141a49 Supply Pod Code Update 2021-01-14 14:31:35 -03:00
Archie 3aabe7d663 Rookie traitor fix? 2021-01-13 16:43:00 -03:00
CapnMachaddish 157c3722ac no longer shitcode 2021-01-12 00:59:24 -06:00
Archie 99fa403e5d Fixes cryo announcements 2021-01-10 12:28:10 -03:00
Archie 80d37a88ae Fixes ghost role text all around 2021-01-10 12:13:31 -03:00