Yosh
e4b827134e
Fixes #8652
...
Fixes #8652
Took me long enough, I'm pretty retarded, and to answer Psi's question,
yes, this fixes it.
2015-03-29 23:19:21 +01:00
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
PsiOmega
710abd0921
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/spells/mind_transfer.dm
2015-03-29 16:23:06 +02:00
PsiOmega
1a000b0e0f
Merge remote-tracking branch 'upstream/dev' into NarsiePort
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-03-29 13:04:53 +02:00
PsiOmega
464d702d4b
Mob refactoring.
...
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
GinjaNinja32
e7b4370772
Fixes #8650
2015-03-28 22:01:02 +00:00
Kelenius
24ef7752cd
Merge branch 'Baystation12/dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/carbon/monkey/monkey.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
2015-03-28 19:14:59 +03:00
Kelenius
30c6646671
Separates affect_mob into three procs
2015-03-28 19:01:51 +03:00
Zuhayr
0c3a18b0b6
Merge pull request #8380 from volas/sanitize_procs
...
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
Zuhayr
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
Zuhayr
c0887333bc
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-03-27 11:13:53 +10:30
Zuhayr
aa6439096c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 23:25:26 +10:30
Zuhayr
ba648e3e8d
Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.
2015-03-26 12:45:12 +10:30
Kelenius
b4b635f32d
Chemistry commit
...
I messed something in the git
2015-03-25 19:09:10 +03:00
Zuhayr
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
volas
5fee41d4ba
sanitize() refactor: third pass (misc)
2015-03-25 01:05:21 +03:00
Zuhayr
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
mwerezak
1ce81b91b1
Adds bread tube trash item
2015-03-24 04:03:06 -04:00
mwerezak
113498dc1e
Makes bread tube nutriment content similar to comparable snacks
2015-03-24 03:57:17 -04:00
Zuhayr
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
volas
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +03:00
volas
855755f808
sanitize() refactor: first pass (sanitize)
2015-03-22 23:31:19 +03:00
Zuhayr
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
PsiOmega
7ab57a4917
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/fancy.dm
code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
Zuhayr
92f53d6b80
Fixes #8478
2015-03-17 20:08:46 +10:30
Zuhayr
b766f9efcf
Fixes #8378
2015-03-17 19:20:33 +10:30
GinjaNinja32
2f4a4a6a6c
Remove medicine crate and medicine cartridge crates
2015-03-16 21:24:30 +00:00
GinjaNinja32
458970a617
Merge remote-tracking branch 'upstream/dev' into reagent_dispenser
2015-03-16 21:21:56 +00:00
Zuhayr
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
mwerezak
3bf5a5ca99
Updates storage costs
...
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
2015-03-05 10:40:25 -05:00
GinjaNinja32
30cfa30c73
Absolute paths
2015-03-02 02:38:12 +00:00
GinjaNinja32
c3388020ff
Reagent dispenser rework
2015-03-02 02:25:32 +00:00
Zuhayr
14321003f1
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2015-02-28 17:04:22 +10:30
Zuhayr
7c2678c9ed
Merge pull request #8317 from Baystation12/master
...
Master into dev-freeze
2015-02-28 17:01:42 +10:30
Zuhayr
71ecceec9e
Fixes #8226
2015-02-28 16:51:37 +10:30
Zuhayr
bead2896bb
Merge pull request #8296 from comma/master
...
Fixes #8270
2015-02-28 16:28:05 +10:30
Chinsky
3d95981394
Fixes #8270
...
Fixes part where alcohol potency was doubled and halves drinking glass volume so it won't hold a half of a bottle.
Also set bottle/shaker volumes to new 30u base most reagent containers like beakers/bottles use nowdays as requested.
2015-02-27 13:40:37 +03:00
GinjaNinja32
8483d7c679
Changes grid logic to be slightly less convoluted, clamp position to inside the object's icon
2015-02-26 18:46:10 +00:00
Zuhayr
391ddd970e
Resolves remaining issues with xenohydro PR.
2015-02-24 17:55:39 +10:30
Zuhayr
d0ca48cd25
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-22 16:28:16 +10:30
mwerezak
5d627d4b24
Fixes compile warning, cleanup
2015-02-21 15:36:33 -05:00
emmanuelbassil
a46540ecd7
Damn you space
2015-02-21 14:53:33 +02:00
Zuhayr
14f8e3beac
Numerous kitchen changes in tandem with prior commit. Removed processor.
2015-02-21 22:24:01 +10:30
Zuhayr
9ad9f19a0b
Transitioning back to using flour as a reagent. Sorry RKF.
2015-02-21 22:04:32 +10:30
emmanuelbassil
feb335c172
Goddamnit.
2015-02-21 11:56:01 +02:00
emmanuelbassil
0621e6adea
Adding ..()
2015-02-21 11:39:36 +02:00
Zuhayr
2139884244
Dev merge.
2015-02-21 19:49:47 +10:30
emmanuelbassil
ec8b3fe195
Forgot the else!
2015-02-21 10:14:33 +02:00
emmanuelbassil
88dd80088c
Using switch statement
2015-02-21 08:43:43 +02:00
emmanuelbassil
db702e13b6
Fixes #8174
2015-02-20 23:33:22 +02:00
