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
Zuhayr
9e7fe6d700
Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.
2014-06-11 01:14:38 +09:30
sick-trigger
027514c6f3
Feed other text fix
...
Fixes #5199
2014-06-10 10:37:43 +10:00
Zuhayr
1e135f91af
Merge resolution with master.
2014-06-02 12:05:12 +09:30
Zuhayr
5f98ccaaf8
Added smaller spraybottle for drones.
2014-05-31 22:15:28 +09:30
Jarcolr
68326eaf95
Adds simple peanuts to hydroponics
...
Thanks to Nienhaus for the sprites.
http://baystation12.net/forums/viewtopic.php?f=44&t=9984
Will update this with more applications for peanuts soon.
2014-05-17 11:48:21 +03:00
Mloc-Hibernia
e3a8d5eb43
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Zuhayr
a68c4e9c55
Fixes #3993
2014-05-10 10:26:05 +09:30
Mloc-Argent
6a11ca32f8
Merge remote-tracking branch 'upstream/master' into dev
2014-05-05 22:22:01 +01:00
Mloc-Argent
e1ddec4a73
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
code/game/objects/items/weapons/manuals.dm
code/modules/mob/living/say.dm
code/modules/organs/organ_internal.dm
code/modules/paperwork/paper.dm
code/modules/supermatter/supermatter.dm
html/changelog.html
icons/mob/uniform.dmi
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-03 16:56:19 +01:00
Zuhayr
c526b9c29a
Lousy goddamn indentation.
2014-05-03 21:09:55 +09:30
Zuhayr
378e6865d4
Attempting to stop IPC from eating and drinking.
2014-05-03 20:25:36 +09:30
Ccomp5950
976ae06e6b
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/living/say.dm
code/modules/paperwork/paper.dm
code/modules/telesci/bscrystal.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-25 21:14:58 -05:00
Brian Cook
182be1a8d3
Added bucket lid sprite and functionality
...
Buckets can be lidded, however there is no change in the sprite when
this happens. This adds a lid and it's functional in game.
2014-04-22 01:57:01 -07:00
