Mloc-Argent
6a11ca32f8
Merge remote-tracking branch 'upstream/master' into dev
2014-05-05 22:22:01 +01:00
Zuhayr
051edb4fc1
Fixes #4421
2014-05-05 16:57:27 +09:30
Ccomp5950
c8c67da6ac
Dionaea nymphs now using new say code and get languages again.
...
dionaea will understand and be understood by humans if they have stolen any blood, it's assumed they learned common.
and a minor fix in hear_say for observers to not get not see simple_animals in (parens) since they have no real_name.
2014-05-04 16:11:10 -05: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
Ccomp5950
2b9833ce0b
Monkies / Dionaea nymphs should be able to emote again as well as not talk while dead.
...
Removed debug msg from broadcaster.dm (oops)
2014-04-25 03:15:14 -05:00
Ravensdale
45d82c2e00
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron
...
Conflicts:
code/modules/mob/living/say.dm
maps/tgstation2.dmm
2014-04-16 22:13:48 -07:00
Ravensdale
1d6655850f
Changes all appropriate instances of toxins to phoron
2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07:00
Ravensdale
0d589ff569
Changes all instances of PLASMA in active code into PHORON
2014-04-10 00:19:29 -07:00
iamgoofball
238451dbc9
die monkey emergency DIE
2014-04-06 12:05:41 -07:00
Mloc
38a22e880f
Merge pull request #4623 from Ccomp5950/bugfixes
...
Bugfixes, Various
2014-03-25 08:45:53 +00:00
Ccomp5950
0225d7b3b0
Bug fix 3: Now with a vengence. Monkey pockets cause scrolled chat.
...
Added the check to see what you clicked in the inventory when clicking on pockets and added a message for it. Now it won't just be a line break.
Fixes #4601
2014-03-23 06:05:23 -05:00
Ccomp5950
28392e9414
Code effeciency project: handle_virus_something() (human and monkey /Life())
...
2 for loops is more expensive then what we're doing here.
Also we check to see if virus2 is populated before starting a for loop
2014-03-22 07:50:23 -05:00
Ccomp5950
8106b6a4ae
Code Effeciency project: Damn monkies Life()
...
pretty much the same effeciencies from human/life()
no need to updatehealth() over and over and over
no need to process environment if everything is normal
etc.
2014-03-22 06:56:09 -05:00
yashaldie
bdd955b036
Fixes Diona Nymph handling updates
...
Diona Nymphs were not getting their Handling procs called.
2014-03-11 05:45:10 -04:00
Mloc-Argent
8deed8dddd
Dionaea can no longer steal blood from species which have the NO_BLOOD flag
...
Fixes #4510
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-03-03 09:15:35 +00:00
Ccomp5950
63a0f1185e
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
code/game/dna/genes/powers.dm
code/game/objects/items/devices/PDA/PDA.dm
2014-02-20 19:16:23 -06:00
Rob Nelson
64f83c51ad
And now tested in game, with some fixes.
2014-02-10 22:47:29 -06:00
Rob Nelson
1088888791
DNA2 EPISODE 2: Revenge of the Bugs
...
Made after DNA2 hit /vg/'s main server after no one tested anything.
* Gene activation/deactivation made modular, refactors domutcheck.
* Standardized genetics disks and injectors a bit in response to buffer corruption issues. (Untested)
* Lots of major bug fixes.
* Skin tones fixed.
Still needs further testing. All I did was mess around with monkeys.
Conflicts:
code/game/dna/dna2.dm
code/game/dna/dna2_domutcheck.dm
code/game/dna/dna2_helpers.dm
code/game/dna/genes/disabilities.dm
code/game/dna/genes/powers.dm
code/modules/mob/living/carbon/monkey/monkey.dm
2014-02-10 22:43:05 -06:00
Rob Nelson
a8d3c0601b
And now tested in game, with some fixes.
2014-02-06 23:52:58 -08:00
Zuhayr
66173043b1
Actually applied nymph speech and name change.
2014-01-29 04:35:44 +10:30
Zuhayr
9301c72933
Fixing case on some del() calls.
2014-01-29 04:31:38 +10:30
Zuhayr
c0b91504b4
Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.
2014-01-28 15:59:50 +10:30
Ccomp5950
c028db481e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/monkey/diona.dm
code/modules/reagents/Chemistry-Machinery.dm
2014-01-23 00:05:53 -06:00
Mloc
e25c60f930
Fix for #4289
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-12 23:23:04 +00:00
Zuhayr
d3d6294ab0
Compile fix, ugh.
2014-01-10 03:07:17 +10:30
Zuhayr
331dd3e286
Added resist check for holder items. Also hopefully prevented dionaea icons from remaining on a human mob.
2014-01-10 01:58:22 +10:30
Zuhayr
35d8219bb6
Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine.
2014-01-09 23:57:20 +10:30
Zuhayr
787da649c1
Safer way to do the alien thang.
2014-01-08 11:05:58 +10:30
Zuhayr
c8b595be95
Added an alien var to metabolize procs for humans and monkeys to tie into alien reagent reactions.
2014-01-08 10:27:21 +10:30
Zuhayr
3b072b32b0
More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.
2014-01-06 14:54:35 +10:30
Zuhayr
7005a66d5b
Fix for containers getting left behind when nymphs grow.
2014-01-04 13:28:32 +10:30
Zuhayr
fa2b6fa6b4
Couple of oversights with diona.
2014-01-04 13:23:59 +10:30
Zuhayr
47dda54a72
Forgot SLOT_HEAD.
2014-01-04 12:53:51 +10:30
Zuhayr
f2300725f7
Made it possible to pick up and wear diona nymphs.
2014-01-04 12:49:55 +10:30
Zuhayr
122f5854d6
Fix for oversight of dionaea needing to breathe.
2014-01-04 12:49:15 +10:30
Zuhayr
62893f80b6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-04 11:35:07 +10:30
Zuhayr
f679776a22
Made diona nymph evolution whitelisted.
2014-01-03 09:37:13 +10:30
Zuhayr
ff52920fab
DNA2 fixes cherrypicked from N3X15.
2013-12-23 00:06:56 +10:30
Zuhayr
b9fcd34df3
Merged config and changelog.
2013-12-22 23:11:29 +10:30
RavingManiac
b26492e66d
Simplified the monkey pulling check as per Giacom's suggestion.
2013-12-21 13:51:06 +08:00
RavingManiac
751219dbfd
Added "hide" verb to mousetraps, placing them on the same layer as hidden mice.
...
Triggered mousetraps and dead mice will be moved back to the top layer.
Monkeys will no longer move randomly while being pulled.
2013-12-18 02:08:38 +08:00
Rob Nelson
53c2aff420
DNA2 - A recode of DNA
...
DNA now stores blocks internally as numbers and only makes the uni_identity and struc_enzymes strings when something has changed. This is vastly more efficient.
In addition, the API for using it has been simplified. Common tasks, such as setting a sub-block, or getting a value from the block, are handled entirely by the DNA datum with simple, easy-to-use procs.
Tested on local server, but may need balancing and additional look-over since the code is from our server (/vg/) and I likely broke or forgot something.
2013-12-01 00:04:27 -08:00
Zuhayr
71416e543e
Changed diona evolution to use nutrition rather than nutriment.
2013-11-20 18:33:39 +10:30
Chinsky
e513b6943e
Forgot to remove lying icons / need for them for monkeys. Ook.
2013-11-06 23:54:13 +04:00
Chinsky
fd928d4b5f
Cleaned the fuck out of smoke.
2013-11-05 02:57:23 +04:00
Segrain
eb9a337d07
Merge remote-tracking branch 'upstream/master' into dev
2013-10-11 12:44:44 +03:00
Segrain
367c1cf4f4
Better check.
2013-10-11 11:10:27 +03:00
Segrain
775d723f68
Typecheck.
2013-10-11 10:21:14 +03:00
Segrain
a4793fd208
Typo fix.
2013-10-11 10:08:04 +03:00
