cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-20 06:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,065 Commits 8 Branches 0 Tags
6b49476cc100b5f4e708a2ed42639c95e6bbadb3
Commit Graph

5796 Commits

Author SHA1 Message Date
Nadyr
1acad29320 Merge pull request #1400 from CHOMPStationBot/upstream-merge-9791 
[MIRROR] Updates bar book to fix styling error, updates placement and removes outdated bar book.
 2021-02-28 07:32:06 -05:00
Nadyr
c23e464602 Merge pull request #1379 from CHOMPStationBot/upstream-merge-9766 
[MIRROR] Emag Changes
 2021-02-28 07:22:36 -05:00
Nadyr
fdf9850149 Update manuals_vr.dm 2021-02-28 06:16:16 -05:00
cadyn
14c7647f5f Update tile_types.dm 2021-02-27 14:53:42 -08:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
5c4a2729f7 Merge pull request #9797 from TheFurryFeline/patch-28 
Moar Typo Fixy
 2021-02-26 00:48:24 +00:00
Chompstation Bot
86b52cc418 Updates bar book to fix styling error, updates placement and removes outdated bar book. 2021-02-24 00:31:31 +00:00
Chompstation Bot
3b9c4c1e60 Emag Changes 2021-02-20 19:43:42 +00:00
Sharkmare
e87bc13ef0 Adds ability ot changed folded pai access 
Allows PAI access to be changed in folded form.

This is literally just a copy paste job with the variable paths changed.

Origin code can be found in pai.dm
 2021-02-19 13:03:03 +01:00
Razgriz
e26a3349d0 Merge pull request #1358 from CHOMPStationBot/upstream-merge-9739 
[MIRROR] Adds in two new manuals for Bar keep and Kitchen.
 2021-02-18 04:32:58 -07:00
Razgriz
a1b49e2fc5 Merge pull request #1357 from CHOMPStationBot/upstream-merge-9738 
[MIRROR] Two fixes for messages I noticed in logs
 2021-02-18 04:32:14 -07:00
Razgriz
29ca7cf466 Merge pull request #1339 from CHOMPStationBot/upstream-merge-9726 
[MIRROR] Fixes malf airtank runtime spam
 2021-02-18 04:28:22 -07:00
Razgriz
0eb0fffc28 Merge pull request #1338 from LunarFleet/book 
Kassc's bedtime story
 2021-02-18 04:27:34 -07:00
Razgriz
c4af6698f2 Merge pull request #1296 from CHOMPStationBot/upstream-merge-9017 
[MIRROR] Add Rapid Pipe Dispenser to R&D
 2021-02-18 04:17:24 -07:00
Chompstation Bot
55abff0e3a Adds in two new manuals for Bar keep and Kitchen. 2021-02-17 19:54:04 +00:00
Novacat
9e5a5c4c46 Merge pull request #9738 from VOREStation/twologfix 
Two fixes for messages I noticed in logs
 2021-02-17 15:40:52 +00:00
Razgriz
728990b8d2 Merge pull request #1349 from CHOMPStationBot/upstream-merge-9734 
[MIRROR] Fixes init issues in _vr files.
 2021-02-16 21:50:46 -07:00
Verkister
90ef89bb75 Merge pull request #9736 from VOREStation/Verkister-patch-8 
Fixes explorer shield light runtime spam
 2021-02-16 20:01:19 +00:00
Novacat
6b62269885 Merge pull request #9734 from MarinaGryphon/init_fixes 
Fixes init issues in _vr files.
 2021-02-16 17:59:00 +00:00
Novacat
2e92857ff5 Merge pull request #9726 from VOREStation/Verkister-patch-8 
Fixes malf airtank runtime spam
 2021-02-15 23:38:19 +00:00
LunarFleet
24453ebf05 Kassc's bedtime story 2021-02-15 17:58:01 -05:00
Chompstation Bot
653d2b9179 Communicator UI Improvements + Camera Console Moving Camera Fixes (rebundled) 2021-02-14 08:51:59 -05:00
Nadyr
39292dfe36 Merge pull request #1291 from CHOMPStationBot/upstream-merge-9676 
[MIRROR] Adds in 1 new eggs end 3 joke eggs.
 2021-02-14 07:33:01 -05:00
Nadyr
83861014e7 Merge pull request #1308 from CHOMPStationBot/upstream-merge-9691 
[MIRROR] [MIRROR] Allows custom-selection of posters
 2021-02-14 07:09:52 -05:00
Novacat
3f3e7c536f Merge pull request #9691 from VOREStation/upstream-merge-7865 
[MIRROR] Allows custom-selection of posters
 2021-02-12 21:27:50 +00:00
Chompstation Bot
6f2b456c79 Add Rapid Pipe Dispenser to R&D 2021-02-11 13:28:31 +00:00
Verkister
113bf6356a Merge pull request #9676 from H0lySquirr3l/master 
Adds in 1 new eggs end 3 joke eggs.
 2021-02-11 10:59:20 +00:00
Verkister
ac8a77dd06 Merge pull request #9612 from VOREStation/upstream-merge-7839 
[MIRROR] Fixed global_announce autospeaker
 2021-02-10 10:11:30 +00:00
Chompstation Bot
d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00
Razgriz
b7d964f87a Merge pull request #1177 from CHOMPStationBot/upstream-merge-9604 
[MIRROR] [MIRROR] Mech Appearance Update
 2021-01-27 18:58:35 -07:00
Razgriz
99d137254d Merge pull request #1196 from CHOMPStationBot/upstream-merge-9614 
[MIRROR] Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
 2021-01-27 18:43:55 -07:00
Razgriz
f97d065119 Update tile_types.dm 2021-01-27 18:13:46 -07:00
Razgriz
8f0f6f804b Update fifty_spawner_tiles.dm 2021-01-27 18:13:25 -07:00
Chompstation Bot
0967736254 [MIRROR] Fixes sif forest grass, adds overgrowth tiles 2021-01-27 19:35:43 +00:00
Novacat
2f8602243d Merge pull request #9614 from Heroman3003/belly-cap-fix-rename 
Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
 2021-01-27 02:24:52 +00:00
cadyn
fe84e96797 Revert "Delete defib timer" 2021-01-24 22:48:39 -08:00
cadyn
2fe77a59ac Revert "fixing defib timer and adding surgery for that shit" 2021-01-24 22:46:10 -08:00
Cadyn
4156dd8085 fixing defib timer and adding surgery for that shit 2021-01-24 21:27:44 -08:00
cadyn
5bbdccefa5 Revert "[MIRROR] Fixes defib timers being 10 times as long compared to intended." 2021-01-24 18:53:16 -08:00
Novacat
a4c4d371db Merge pull request #9604 from VOREStation/upstream-merge-7818 
[MIRROR] Mech Appearance Update
 2021-01-25 00:51:12 +00:00
cadyn
d3f6cba62c Merge pull request #1175 from Sharkmare/sahoc-rising 
Readds all Sahoc items
 2021-01-24 08:53:48 -08:00
cadyn
3c541d7ecb Merge pull request #1176 from Darlantanis/VoreSlug 
Vore slug and forest turf fix
 2021-01-24 08:46:49 -08:00
Sharkmare
bdfcc014f7 Adding reset owner feature and modulus operandi ala cadyn 2021-01-24 17:43:25 +01:00
Darlantan
a2f77d1eb1 Fixes Sif forest turfs 2021-01-24 11:02:43 -05:00
Sharkmare
39e0e9ce63 Readds all Sahoc items 
The egg is back.
 2021-01-24 16:43:03 +01:00
cadyn
c5ae5ec866 Merge pull request #1134 from CHOMPStation2/cadyn-patch-5 
Delete defib timer
 2021-01-24 06:52:37 -08:00
cadyn
4f9ed16579 Merge pull request #1165 from CHOMPStationBot/upstream-merge-9598 
[MIRROR] Fixes defib timers being 10 times as long compared to intended.
 2021-01-24 06:52:18 -08:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Novacat
57e1be6caa Merge pull request #9598 from Heroman3003/defibfix 
Fixes defib timers being 10 times as long compared to intended.
 2021-01-24 06:34:15 +00:00
cadyn
c05d687ec2 Update defib.dm 2021-01-19 19:15:27 -08:00