cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,552 Commits 10 Branches 0 Tags
68dc63e005f801bf5a2cb10b8c89ddcd1323d219
Commit Graph

277 Commits

Author SHA1 Message Date
Zuhayr
cf68ad7c87 Master to dev merge. 2014-08-27 20:24:07 +09:30
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
LightningIron
7de4825a87 Changes some messages to make more sense 2014-08-24 14:09:39 -05:00
PsiOmega
f19001feb8 Renames anti-toxin bottles to dylovene. Soporific tossed out. Sleep toxin renamed to Soporific. 
Based on http://baystation12.net/forums/viewtopic.php?p=237269#p237269
 2014-08-23 17:22:04 +02:00
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Whitellama
f1494c9b76 Admins now get logs when welding fuel is spilled on the floor, and welding tanks gain fingerprints when someone gets fuel from them. 2014-08-17 02:48:08 -07:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
Whitellama
dad248d49d Fixed #5870: Glasses being labeled both 'glass' and 'Drinking glass' inconsistently 2014-08-01 16:39:19 -07:00
Zuhayr
251b44a53c Changed hydro trays, fertilizer and syringes over to use the reagent procs. 2014-07-30 12:24:03 +09:30
Zuhayr
ad8ef7c4ab Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-28 20:59:29 +09:30
Loganbacca
4861c5a5d4 Grammar tweak 2014-07-28 07:38:24 +12:00
Loganbacca
fbc9b03e73 Cup fix 
- Grammar fix for drinking from cups
- Changed "Glass of Tomato juf" to "Glass of Tomato juice" (I'm assuming this was a typo)
 2014-07-27 20:04:45 +12:00
Zuhayr
4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Zuhayr
d8336061b4 Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev 2014-07-25 23:02:21 +09:30
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Zuhayr
57b790ad92 Merging. 2014-07-25 22:50:35 +09:30
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
Mloc-Argent
d5e9851b62 integrate XGM into the code 
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-07-22 19:52:12 +01:00
Hubblenaut
52c0d83a2c Cans now actually make use of the new 4x4 grid 2014-07-21 12:08:50 +02:00
Zuhayr
60d9d3d5e6 Merge resolution. 2014-07-21 16:34:38 +09:30
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Whitellama
eb2ec42345 Fixed #5697, grammatical error with empty glasses, cans, condiment containers 2014-07-19 16:22:09 -07:00
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
mwerezak
1a52aa7b06 Merge remote-tracking branch 'upstream/dev' into op-hideout 2014-07-16 17:41:30 -04:00
Zuhayr
f4ff51f146 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:32:00 +09:30
Hubblenaut
4ee6b77289 Adds new syndicate closet and adjusts nuke setup 2014-07-15 17:22:03 +02:00
Hubblenaut
38895916b6 Adds grey shuttle tiles and drug syringes 2014-07-15 17:20:04 +02:00
Ccomp5950
67bf27e6f4 Merge pull request #5602 from Hubblenaut/food 
Grid Placement for Food
 2014-07-15 01:22:47 -05:00
Hubblenaut
c920b0234f Renames CoM into center_of_mass 2014-07-14 23:13:46 +02:00
Whitellama
a6b4f5d2aa Fixed issues with cans complaining twice when trying to drink unopened and with transfering fluids between closed cans 2014-07-13 23:23:26 -07:00
Hubblenaut
b7778ff420 Fixes merge conflict 2014-07-13 21:35:31 +02:00
Hubblenaut
31637edf76 Introduces function for exact item placement of food and applies it to each food item in the game 2014-07-13 19:37:33 +02:00
Zuhayr
70ba371658 Merge resolution. 2014-07-11 12:47:16 +09:30
Zuhayr
21e625d89b Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules. 2014-07-05 16:48:59 +09:30
Hubblenaut
dfece9fe12 Stops buckled mobs from slipping (for now) 2014-07-02 22:36:49 +02:00
Mloc-Argent
6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm
 2014-06-30 23:44:46 +01:00
Ccomp5950
1ba345ca8c Teacup icon clipping fix. 
Might need to be done to coffee as well.

Thanks Serveris6 for the report:  http://prntscr.com/3wyah5
 2014-06-27 02:29:45 -05:00
Chinsky
4cd4217488 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge 
Conflicts:
	code/modules/organs/organ_external.dm
 2014-06-24 04:22:28 +04:00
Chinsky
3ff6c41846 Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand(). 
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.
 2014-06-24 04:19:09 +04:00
Chinsky
ece48ae0c4 Moved same code into single organ helper to handle embedding. 2014-06-24 04:09:35 +04:00
Chinsky
b2b9907605 Lowers caused damage to make it destroy organs rarer. 2014-06-24 03:56:34 +04:00
Chinsky
e3930fa79e Monkey cube now expand when eaten, leading to !!FUN!! 2014-06-24 03:42:23 +04:00
Zuhayr
1cfb9b6ea1 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-22 21:58:46 +09:30
Zuhayr
bb8951a53c Makes forks usable. 2014-06-22 21:49:55 +09:30
mwerezak
5a3c7dc432 Fixes human/checkarmor getting the armour... 
...value for the wrong body part.

Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
 2014-06-18 10:05:04 -04:00
Chinsky
be95e54e43 Merge branch 'master' into dev 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-06-17 16:16:44 +04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
 2014-06-15 20:25:39 -04:00
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30