cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-29 23:56:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,939 Commits 26 Branches 0 Tags
thirst
Commit Graph
147 Commits
Author SHA1 Message Date
Vladin ac11142edc walk on fire 
not really tho
 2021-02-02 20:30:16 -05:00
QuoteFoxandGitHub 3d1aabd694 Merge pull request #937 from quotefox/economy 
Hyper Economy part 1 - Money Movement.
 2021-01-29 01:18:58 +00:00
QuoteFox 39a5e2863e final touches to part 1 
final touches to part 1
 2021-01-29 01:08:23 +00: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
QuoteFoxandGitHub 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
QuoteFoxandGitHub 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 0a61a40231 fixes 
fixes
 2021-01-21 14:46:31 +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 cba5255206 Modular doors 
Modular doors
 2021-01-21 11:10:54 +00:00
Archie ec3a68dc7a Runtime man bad 2021-01-19 18:09:23 -03:00
CygnusBandGitHub 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
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
Archie 41540397db Fixes a bunch of fallout 2021-01-16 16:12:38 -03: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
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 c164b52b30 Merge remote-tracking branch 'upstream/master' into nexties2 2021-01-08 15:20:47 -03:00
Archie 78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
kevinz000andArchie 939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540 
Unicode support updates from tgstation.
 2021-01-08 07:11:56 -03:00
LinandArchie 02da471330 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2021-01-06 15:39:13 -03:00
kevinz000andArchie 625b35b8cb Merge pull request #9755 from Ghommie/Ghommie-cit331 
lentext to length, yet another 513 requirement.
 2021-01-05 17:39:10 -03:00
BlackMajorandArchie 02cb328921 Merge pull request #9747 from Ghommie/Ghommie-cit329 
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
 2021-01-05 16:58:19 -03:00
Archie 9e37d3be62 Fix merge conflicts 2021-01-05 03:41:08 -03:00
Archie 10e74b643e Fix scanners.dm conflict 2021-01-05 03:31:28 -03:00
LinandArchie b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408 
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
 2021-01-05 01:34:16 -03:00
Archie d98266036f New sleeper interface 2021-01-04 21:15:19 -03:00
GhomandArchie 291dcf9515 Merge pull request #10575 from Arturlang/TGUIs_Nexties 
[TESTMERGE] Properly working TGUI Next
 2021-01-04 19:47:54 -03:00
kevinz000andArchie 7f2de64be7 RCD Update Sync 2021-01-04 18:13:02 -03:00
kevinz000andArchie 8e51c88d0e Porting Robustin's Syndicate Infiltrator PR from tee-gee 2021-01-02 16:53:52 -03:00
Chloe Carver-Brown c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
Archie d241229ba0 Merge remote-tracking branch 'upstream/master' into Surgery 2020-12-28 16:43:57 -03:00
GhomandArchie 8b918b1d82 Merge pull request #10630 from Citadel-Station-13/kevinz000-patch-17 
Nerfs cloning
 2020-12-27 06:42:41 -03:00
Archie 188cc10974 Merge remote-tracking branch 'upstream/master' into Surgery 2020-12-27 04:29:21 -03:00
Archie 5710e12cb5 Surgery ports 1 2020-12-27 04:25:28 -03:00
Archie e23546c3a4 sleeper 2020-12-25 17:32:54 -03:00
LinandArchie a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
DahlularandGitHub 02b1aba9d7 Merge pull request #709 from ArchieBeepBoop/blacklistfix1 
Re-Porting the Trait Blacklist System (Fixes broken respawn traits)
 2020-12-01 20:14:06 -07:00
BlackMajorandDip 3637fb2c1b Merge pull request #10082 from Citadel-Station-13/kevinz000-patch-122 
Bluespace launchpad QoL (read: powercreep)
 2020-11-22 06:04:23 -03:00
DahlularandGitHub 0884fc0f66 Merge pull request #704 from ArchieBeepBoop/dummyruntimes 
I'M FIXING THESE RUNTIMES, WITH NO SURVIVORS.
 2020-11-21 23:03:08 -07:00
DahlularandGitHub fa5e05c44c Merge pull request #702 from ArchieBeepBoop/idbullshitpart3 
Cleaning up ID Console code and other tweaks - The "I want to die" edition
 2020-11-21 23:00:50 -07:00
Dip 2a5c61dc45 fuck me 2020-11-22 01:29:01 -03:00
Dip ccd2d137b7 Fixes some dummy thicc runtimes 2020-11-21 03:03:27 -03:00
Dip 1b529c1ca1 errr 2020-11-20 21:01:24 -03:00