cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,931 Commits 6 Branches 0 Tags
08fc5f81d655737c3f86c86d1808cfa715bd922a
Commit Graph

25896 Commits

Author SHA1 Message Date
Arokha Sieyes
08fc5f81d6 Merge pull request #1173 from VOREStation/aro-syntfabupgr 
Makes synthfab upgrades do something
 2017-03-13 03:44:38 -04:00
Arokha Sieyes
e0bafbd878 Whups. 2017-03-13 03:09:51 -04:00
Arokha Sieyes
03d6dea950 Merge pull request #1172 from VOREStation/aro-ventweldcrawl 
Don't allow ventcrawling if vents are welded
 2017-03-13 02:25:22 -04:00
Arokha Sieyes
3315fcf1e2 Makes synthfab upgrades do something 
Matter bins increase storage amount, manipulators decrease brute amount, scanner decreases burn amount. All upgraded to max will do no damage and store 90,000 materials (30,000 default).

For #1117
 2017-03-13 02:25:03 -04:00
Arokha Sieyes
b82c5a8ca4 Don't allow ventcrawling if vents are welded 
What's the point of welding vents, again?
 2017-03-13 02:00:40 -04:00
Arokha Sieyes
65cb118f93 Merge pull request #1170 from VOREStation/aro-advmedbleed 
Fix internal bleeding on adv med scanners
 2017-03-13 01:53:14 -04:00
Arokha Sieyes
0bb3a71625 Merge pull request #1169 from VOREStation/aro-newpolsync 
Polaris Sync
 2017-03-13 01:50:11 -04:00
Arokha Sieyes
7123396663 Fix internal bleeding on adv med scanners 
The nanoui template expects "internalBleeding" to be in the organStatus list, not in the organData list. I agree with this expectation, as this is also where normal "bleeding" is stored, so I updated the adv_med.dm file rather than changing the template.
 2017-03-13 01:43:38 -04:00
Arokha Sieyes
6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync 
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
 2017-03-13 01:29:01 -04:00
Arokha Sieyes
c6e8ab9e1b Merge pull request #1167 from VOREStation/aro-nfoods 
Add several new foods
 2017-03-13 01:21:10 -04:00
Arokha Sieyes
e4a99ccae4 Update my favorite vendor while I'm at it. 2017-03-13 01:03:25 -04:00
Arokha Sieyes
01edd04bc5 Add several new foods 
Sushi, Lasagne, Wings, Doner Kebab, Reishi's Cup, Hot&Sour Soup, General Tso's, Kitsune Udon, Goulash, Roast Beef

Also made it so synths don't have reduced taste. You can just RP it however you want, I'd rather let them see the info about flavor and if you want to RP that you have low quality taste 'sensors' then so be it.
 2017-03-13 00:36:34 -04:00
Anewbe
e526a4cdc7 Merge pull request #3062 from Anewbe/skull_head 
Adds Morpheus skull head
 2017-03-12 20:05:23 -05:00
Anewbe
a1b90a0411 Merge pull request #3080 from Neerti/3/10/2017_i_hate_byond_regex 
Adds Two QOL Say/Emote Features
 2017-03-12 19:48:18 -05:00
Anewbe
cb85943043 Merge pull request #3068 from Leshana/vplk-canister-leak 
New Event: Canister Leak
 2017-03-12 19:38:59 -05:00
Anewbe
e2680eff87 Merge pull request #3063 from Anewbe/tank_fix 
Changes tank sprite for Vox
 2017-03-12 19:26:07 -05:00
Anewbe
ecc5b13908 Merge pull request #3076 from Leshana/handcuffs-hud 
Fix handcuff hud icons appearing on the left and right hand inventory hud slots when handcuffed.
 2017-03-12 19:24:56 -05:00
Neerti
11b1185005 Adds Two QOL Say/Emote Features 2017-03-12 09:30:48 -04:00
Arokha Sieyes
9feec8e4ed Merge pull request #1164 from VOREStation/aro-posisurg 
Allow MMI/Posi/Digi brains w/o minds to be put in bodies
 2017-03-12 01:30:02 -05:00
Arokha Sieyes
67bc8132a3 Allow MMI/Posi/Digi brains w/o minds to be put in 
Right now if you try to put an empty posibrain into a mob it won't let you. But with resleeving, this might be just the step before putting a mind in them, so that's sort of not how it should work. When it was just a ghost-trap object that ghosts could get into, maybe, but it's moved beyond that.
 2017-03-12 01:15:40 -05:00
Arokha Sieyes
a0c4b05ec3 Some map tweaks 
Mostly area placement tweaks in the bar so it's not "two" areas, renamed the "longue" to be spelled right, fixed a christmas tree, fixed a disposals pipe.
 2017-03-12 00:12:32 -05:00
Anewbe
6a26b48469 Merge pull request #3067 from VOREStation/batt 
Give internal cell its own icon
 2017-03-11 21:27:20 -06:00
Arokha Sieyes
91ec566408 The ultimate in food vending 
Since some foods were removed.
 2017-03-11 19:28:14 -05:00
Leshana
d8099edc4c Make sure that the canisters selected have a bit o' air in them. 2017-03-11 19:02:24 -05:00
Arokha Sieyes
55b2bd3b95 I guess these foods are gone or moved. 2017-03-11 19:00:43 -05:00
Arokha Sieyes
4c0e330140 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync 2017-03-11 18:47:17 -05:00
Yoshax
14a667abec Adds more types of tea 2017-03-11 22:01:19 +00:00
Anewbe
17cedd22a6 Merge pull request #3071 from Yoshax/goodfood 
Slightly improves upon food creation
 2017-03-11 11:05:27 -06:00
Arokha Sieyes
55f17ded47 Merge pull request #1158 from JoanRisu/Fluff_Items_worshop 
Fluff items workshop
 2017-03-11 01:22:25 -05:00
Arokha Sieyes
2777ce58c8 Merge pull request #1159 from Yoshax/moarmining 
Belt mining slight expansion
 2017-03-11 01:22:06 -05:00
Leshana
baf8e2d143 Fix handcuff hud icons appearing on the left and right hand inventory hud slots when handcuffed. 
We define the inventory screen objects for hands to be special in that apply overlays to themselves for handcuffed.  By putting that logic on the screen object itself, we allow it to be expanded to other cases besides handcuffs in the future without conflict.
 2017-03-10 22:06:05 -05:00
Anewbe
e4fe4256b7 Merge pull request #3066 from Neerti/3/9/2017_wet_skrell_are_liars 
Skrell/Tesh Examination Change
 2017-03-10 20:53:53 -06:00
Yoshax
056d31a4cd Fixes a warning 2017-03-11 02:40:29 +00:00
Yoshax
d98fcfcc14 Adds pike, weak pike and strong carp, also adds them to the belt mining lists 2017-03-11 02:40:18 +00:00
JoanRisu
388bf0a537 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-03-10 15:13:01 -08:00
Arokha Sieyes
cb02263050 Merge pull request #1157 from Cameron653/master 
Adds Vorrarkul's chococoat
 2017-03-10 18:07:44 -05:00
Arokha Sieyes
a25539122a Merge pull request #1156 from Screemonster/patchingbulkheads 
makes broken doors patchable
 2017-03-10 18:07:36 -05:00
Arokha Sieyes
37fbc39ce6 Merge pull request #1146 from Screemonster/particlescience 
adds particle guns to science and cargo
 2017-03-10 18:07:29 -05:00
Arokha Sieyes
0bbc12893c Merge pull request #1154 from VOREStation/aro-translator 
Translator Improvement
 2017-03-10 18:05:27 -05:00
Cameron653
7cc2010e49 Fixes a mistake 2017-03-10 17:25:35 -05:00
JoanRisu
337eb55cc4 Adds missilerack and open rover icons in. 2017-03-10 14:22:40 -08:00
killer653
a115d8dc2b Adds Vorrarkul's chococoat 
Resolves #1102
 2017-03-10 17:20:50 -05:00
Screemonster
aace86cbc4 returning an actual value might help 2017-03-10 21:57:39 +00:00
Screemonster
c9032e1539 makes broken doors patchable 2017-03-10 21:44:28 +00:00
Yoshax
3a31c88f43 Fixes sliceable food and slices 2017-03-10 19:49:15 +00:00
Yoshax
6f12826c45 Adds ability to add food to the chem master because the condimaster is beyond broken 2017-03-10 17:00:31 +00:00
Yoshax
26d56e2cf4 Fixes/adds reagent transferring to/from food 2017-03-10 16:39:57 +00:00
Arokha Sieyes
4902e94c0b Merge pull request #1145 from JoanRisu/Fluff_Items_worshop 
Conflict Resolver: Revenge of the Merge
 2017-03-10 09:49:31 -05:00
JoanRisu
11b8810c34 Minor edit to correct plague doctor mask for octavious 2017-03-10 00:21:50 -08:00
Mechoid
467cea8a00 Multi-sprite Panel updoot. 2017-03-09 22:54:44 -08:00