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
31,934 Commits 6 Branches 0 Tags
2fea474564981b51a73f0cb5efa838fbe5da0e94
Commit Graph

603 Commits

Author SHA1 Message Date
SinTwo
a2a2f58e93 Fixes #2352 2016-08-27 13:44:32 -04:00
Hubblenaut
10391e5f3b Bottles will now sell for their set prices. 2016-08-15 15:32:28 +02:00
Yoshax
058b6f1aa3 Further weapon force tweaks 2016-08-07 15:00:25 +01:00
Yoshax
60c4fb436c no message 2016-08-07 01:39:55 +01:00
Yoshax
403c9adcdb Low/er end combat force adjustments 2016-08-07 01:31:45 +01:00
Yoshax
f90f2ec08a Fixes some items on working on people on tables 2016-07-26 03:10:54 +01:00
Anewbe
612a6f8328 Merge pull request #2149 from SinTwo/item_state 
Item State Cleanup
 2016-07-23 15:53:36 -05:00
Yoshax
baa25044c3 Ensures drinking glasses have a cost in the autolathe 2016-07-23 20:15:22 +01:00
SinTwo
976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
 2016-07-13 17:07:52 -04:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
mwerezak
108a748d1f Fixes pepperspray making sounds even when the safety is on 2016-07-11 04:54:40 +01:00
EmperorJon
5b3c952be9 Merge pull request #2039 from SinTwo/smallfeatures 
Water-Coolers, Floor Lamps, and Benches
 2016-07-08 09:54:11 +01:00
SinTwo
5c4c283b80 changelog and span tags 2016-07-07 20:38:46 -04:00
Mloc
7377f57e5d adds bun-bun, a bread monkey made with two burger buns 
Signed-off-by: Mloc <colmohici@gmail.com>
 2016-07-05 18:19:05 +01:00
SinTwo
386ceb2bc5 makes water-cooler bottles attainable through in-game means 2016-07-04 18:17:53 -04:00
SinTwo
c7db22b985 water cooler fixes 2016-06-29 16:36:43 -04:00
Datraen
a10f525638 Adds compatability with cooking code 2016-06-29 15:40:34 -04:00
SinTwo
da38eca686 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into featureattack 2016-06-19 22:28:31 -04:00
SinTwo
86e500d25c Adds floor lamp, benches, new tank sprites, and cup dispenser on water coolers. 2016-06-19 22:28:01 -04:00
HarpyEagle
58b87f1a4b Adds do_surgery() behaviour for various items 
Heath scanners, autopsy scanners, syringes, hyposprays, droppers and bottles.
 2016-06-17 19:06:56 +01:00
Yoshax
3e0745677f Fixes chocolate milk and milk 2016-06-13 20:20:07 +01:00
Yoshax
730fceb2d7 Makes Datraen happy 2016-06-09 17:23:43 +01:00
Yoshax
52f8c6a344 Ensures retail scanners work with drinks 2016-06-09 17:08:07 +01:00
GinjaNinja32
72e32eeed9 Fixes, change underlay icons to fit with glass icon style 2016-06-07 17:41:25 +01:00
Yoshax
3211ca961b Makes coffee cups somewhat work 2016-06-07 16:35:29 +01:00
GinjaNinja32
debfd3dabf Ports GinjaNinja32's drinks rewrite from Bay 2016-06-06 20:33:11 +01:00
Yoshax
0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Yoshax
722c099847 Merge pull request #1788 from Datraen/Xenobio2_Tweaks 
Xenobio2 tweaks
 2016-05-29 03:56:39 +01:00
Datraen
1e6ecb0c88 Xenobio2 Tweaks 
Adds nameVar to products, sets it to products/xenos when they are created from the proper machinery.
Adds the manual injector to the machinery that can take beakers, preventing them from spilling onto the machine when inserted.
Tweaks the NanoUI to properly display percent mutated, adds a proper check to see if it is not a xeno occupant.
 2016-05-28 20:06:51 -04:00
Yoshax
cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
Neerti
cbd4915420 Merge pull request #1592 from Anewbe/borg_changes 
Various Borg Changes
 2016-05-28 12:44:27 -04:00
Arokha Sieyes
ea6754597e Ports Bay's Robolimb Changes (#1779) 
* Consolidates copypasta for repairing robolimbs

Also prevents self-repairing a limb you are using to hold the tool

* Fixes robot organs becoming undamagable after reaching cap

* Fixes repairing with cable not using any cable, repairing with weldingtool not doing eyecheck

* Removes ORGAN_ROBOT and ORGAN_ASSISTED flags, fixes #13123

* Fixes damage to robotic limbs not triggering organ processing

At the same time, robotic limbs with damage don't need to process.
However, it's much safer to explicitly have robot limbs return 0 from
needs_process() instead of not rechecking bad external organs.

* Build on HarpyEagle changes to apply to Polaris

Had to apply the change from flag to an enumeration.

* Removes unneeded file

* Fix bruisepacks, remove heart

Well, the unused bay version of the heart anyway

* Tweaks examine, reverts isSynthetic

Reverted that because Bay doesn't use it the same way. Also changed Examine to not list every robo-limb on non-FBPs in red, but left them listed as normal per Spookerton
 2016-05-28 14:12:19 +01:00
Datraen
dd4483d055 Merge pull request #1710 from Yoshax/fitnessvendor 
Adds a new vending machine that vends fitness related products
 2016-05-21 12:11:29 -04:00
Yoshax
3044f6c080 Fixes never being able to light molotovs and makes throwing them less crap 2016-05-21 15:10:49 +01:00
Yoshax
6142af14d2 Adds a new vending machine that vends fitness related products 2016-05-20 22:04:00 +01:00
Yoshax
c6c372056a Gives reagents/reagent_containers the absolute pathing treatment 2016-05-16 21:07:20 +01:00
Yoshax
5cb4ae9879 Adds shot glasses 
Cleans up a list in the booze vendor
Removes tea from contraband and puts into the normal product list in the booze vendor
Adds the shot glasses to the autolathe and makes glasses there no longer children of bucket recipes
 2016-05-16 20:06:10 +01:00
Yoshax
e2293f1e79 Gives drinking glasses a material so they have a cost in autolathe 2016-05-08 15:51:16 +01:00
Anewbe
ac3ce2e7d1 Makes borgs more versatile 2016-05-07 23:52:03 -05:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation. 
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
 2016-05-04 00:24:55 -04:00
Datraen
8483146716 Merge pull request #1478 from Nerezza/PizzaUpdate 
Makes opening/closing pizza boxes easier
 2016-04-28 09:25:43 -04:00
HarpyEagle
3ae1f9ed78 Updates more instances of blocked<2 or /=(blocked+1) 
Removes facehugger source code file
 2016-04-22 21:04:31 -04:00
HarpyEagle
5543209bbd Fix macro 2016-04-22 04:58:25 -04:00
mwerezak
28192c6675 Adds cooldowns to eating/feeding, allows attacking with reagent containers while on harm intent. 2016-04-22 04:58:25 -04:00
mwerezak
4951790b50 Fixes missing cooldowns, missing cult blade sound. 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2016-04-22 04:58:25 -04:00
mwerezak
deb215d262 Refactors bottle smashing, apply_hit_effect() now returns the blocked status. 
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
 2016-04-22 04:57:23 -04:00
Nerezza
4c7537e180 Makes opening/closing pizza boxes easier 
Alt-click now opens/closes pizza boxes like a laptop.
 2016-04-21 21:43:32 -05:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Datraen
2b53efdfd5 Merge pull request #1303 from Hubblenaut/hydro 
Full fertilizer bottles of type glass/bottle
 2016-04-20 11:31:31 -04:00
Hubblenaut
2b44de88b1 Change to absolute pathing 2016-04-20 13:21:35 +02:00