cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 8 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

1417 Commits

Author SHA1 Message Date
Yoshax
6142af14d2 Adds a new vending machine that vends fitness related products 2016-05-20 22:04:00 +01:00
Datraen
bb7713b2a8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 
# Conflicts:
#	code/game/objects/items/devices/multitool.dm
 2016-05-19 17:31:25 -04:00
Arokha Sieyes
7914c9d943 Merge branch 'master' of https://github.com/VOREStation/Polaris into sync 2016-05-18 10:13:26 -04: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
Arokha Sieyes
f8fe9994e5 Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update 
# Conflicts:
#	code/world.dm
#	config/example/config.txt

Resolved by removing old lines.
 2016-05-15 12:39:30 -04:00
Anewbe
45b888fbfb Alters Unathi biology 2016-05-12 19:08:23 -05:00
Datraen
3d9435c9b3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
 2016-05-12 17:24:55 -04:00
Arokha Sieyes
17a64bebea Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix 
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/new_player/new_player.dm
#	vorestation.dme
 2016-05-12 13:02:51 -04:00
Datraen
4456f77d75 Merge pull request #1551 from Zuhayr/master 
Makes slime people more interesting and thematic.
 2016-05-11 02:34:50 -04:00
Leshana
abbf0c7fc0 Issue #4 - Porting resize (micro/macro) systems. 
* Instead of "playerscale" we are using pre-existing variable
 "size_multiplier" but we move it to /mob/living
* Added basic mechanics of size changing.
* Mousetraps snap small people even if they have shoes.
* Big people can walk over small people, or stomp them, or capture them
 in foot slot.
* Ported holder for micros, making small people scoopable.
* Tied held micros in with the vore code so they are edible.
* Ported size-altering reagents and recipies.
* Ported size gun along with associated sprites and sounds.
 2016-05-08 23:11:03 -04: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
Zuhayr
6edb8b31f3 Made slimes more interesting. 2016-05-06 04:07:52 +09:30
Dibasic
626dc8a2f6 Change chemmaster custom preset to 15 and adds options for 30 and 60 units (#1548) 
* Change chemmaster custom preset to 60

60 is more commonly used for filling a whole bottle. The preset was 30 back when bottles only held 30.

* Adds options for moving 30 and 60 units

Also changes the default to 15 because 30 and 60 are now options.
 2016-05-04 23:23:59 -04: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
mwerezak
11c5b10bb9 Refactors various item attack() implementations 
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.

Conflicts:
	code/game/objects/items/weapons/clown_items.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2016-04-22 04:57:22 -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
Datraen
11a6e74ea9 Fix reagent handling, magic numbers, other errors. 2016-04-21 13:39:52 -04: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
EmperorJon
ebeaddea6e Merge pull request #1414 from Mark9013100/4/15/2016tank_grammar 
Fixes some punctuation
 2016-04-20 13:23:51 +01:00
Hubblenaut
2b44de88b1 Change to absolute pathing 2016-04-20 13:21:35 +02:00
EmperorJon
47f715805e Merge pull request #1442 from Yoshax/drinksloadout 
Loadout (vacuum-)flask contents now configurable.
 2016-04-18 16:33:42 +01:00
Yoshax
f0c69e663d Fixes error 2016-04-18 15:53:09 +01:00
PsiOmegaDelta
2e6f2c53a6 Loadout (vacuum-)flask contents now configurable. 
Can now prefill the loadout flask and vacuum-flask with a relevant liquid of your choice.
 2016-04-18 15:30:26 +01:00
HarpyEagle
03c2ace543 Fixes #11520 
Makes overdosing check volume instead of amount metabolised as its criteria
 2016-04-18 15:16:31 +01:00
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port 
Ports Bay's new inventory system.
 2016-04-16 02:58:07 +01:00
Mark9013100
06cff6d6af Fixes some punctuation 2016-04-15 01:01:58 -04:00
Datraen
dab56d472b Adds default reagent amounts to slices if they have no reagents. 2016-04-06 23:50:14 -04:00
Neerti
469c01daf9 Manually ports Bay's volume inventory system. 2016-04-06 03:31:21 -04:00
PsiOmegaDelta
48b773fcfa Can now select the design and contents of your loadout lunchbox. 
Also allows gear tweaks to take up a whole row on their own, due to potential length.
Also fixes a couple of incorrect && logical operations. Should have been ||.
 2016-04-05 11:57:30 -04:00
Hubblenaut
3a45ceee64 Full fertilizer bottles of type glass/bottle 2016-03-30 19:42:13 +02:00
Neerti
96e52f5af0 Merge pull request #1229 from SinTwo/construction_update 
Construction update
 2016-03-26 15:45:19 -04:00
Datraen
357fd67a65 Merge pull request #1159 from Kelenius/playingWithTravis 
Attempts to port bay's travis update attempts
 2016-03-26 13:18:55 -04:00
SinTwo
f0487bc6b4 Reagent Dispenser Update 2016-03-25 16:59:07 -04:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Neerti
3e45f9f727 Merge pull request #1235 from Yoshax/watercooler 
Watercooler can be wrenched/unwrenched now
 2016-03-23 20:28:12 -04:00
Kelenius
df5a0d7941 Mob inventory cleanup 
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
 2016-03-24 01:23:08 +03:00
Mark9013100
ce1e4bc33b Capitalizes pill description. 2016-03-23 16:09:21 -04:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Brian Cook
9edc1dd549 Watercooler can be wrenched/unwrenched now 
Fixed capitalization in some cases
 2016-03-23 13:13:54 +00:00
Datraen
fbbfb78dec Merge pull request #1212 from Kelenius/feedMeLight 
Fixes #1171 - ninja suit injects nutriment
 2016-03-22 15:15:14 -04:00
Matt
61d2eb1d3e Properly log dropper-related assault for admins 
Fixes bug #1219

Moving the logging from post-dropping (when the dropper is empty) to Pre-drop, post-dropable check (it should not be located at the point when a drop is going to occur, but just prior to actually doing so).

As always, please review this change to make sure I didn't break anything.  All I did was cut-paste the lines to a few lines above, but hey, never hurts to double-check!
 2016-03-22 13:11:48 -04:00