DZD
3939abaf5d
Fix Conflicts and Sync with Upstream
...
Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172
2015-01-16 17:07:22 -05:00
DZD
475ca3f666
Wizard Update Part 8
...
- Fixes horsemask spell to work on non-human races.
- Removes ability of Summon Item to mark and recall brains due to
problems with organ system.
- Makes weeping angels turn back to their human form after Flesh to
Stone wears off if they were created via F to S and the Staff of
Animation. (/tg/ port)
2015-01-16 16:39:12 -05:00
Markolie
8386e32038
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
maps/cyberiad.dmm
2015-01-16 21:55:16 +01:00
Markolie
e59a94a8a1
Constructable newscaster, labor camp overhaul, other fixes
2015-01-16 21:50:33 +01:00
Fox-McCloud
803f472085
Tweaking of Movement Speed
2015-01-16 15:28:03 -05:00
Fox-McCloud
be0c0929b4
Merge pull request #170 from Markolie/master
...
Blob event fix, mapfix, AI/robot fix
2015-01-15 22:02:54 -05:00
Markolie
5646a9cc69
Blob event fix, mapfix, AI/robot fix
2015-01-16 01:42:56 +01:00
Fox-McCloud
baa88a7463
Fixes
2015-01-15 19:42:15 -05:00
DZD
8a03f88923
Minor Slime Additions
...
- Injecting slimes with plasma will increase their chance of mutating,
up to 50%.
- Injecting slimes with inaprovaline will decrease their chance of
mutating, this can reach 0%.
- Injecting a grey slime core with water will produce inaprovaline
inside the core.
- You can feed slimes plasma bars to make them more friendly, this does
NOT work the same way as pink slime extracts, but rather like feeding
them a monkey and punching the monkey to unconsciousness.
- Adds gold slime core + blood reaction, will spawn a mob that plasma +
gold core reactions normally spawn, but the mob will not be hostile.
This does not prevent space bears from becoming VERY pissed off if you
pet them.
All shamelessly ~~open source stolen (thefted?)~~ ported from /tg/.
2015-01-13 22:24:13 -05:00
Markolie
6a0d3a60b7
Changeling DNA fixes
2015-01-13 20:17:00 +01:00
Markolie
b3075f0704
Simplify and cleanup IPC/defib revival after messy fixes
2015-01-13 17:33:46 +01:00
Markolie
548ad9a5ca
Defib/IPC fix?
2015-01-13 02:48:42 +01:00
Markolie
8163056147
Let drained robots move
2015-01-13 01:44:03 +01:00
Markolie
60e18d0c0e
Major map overhaul, remove customs officer/nanotrasen recruiter
2015-01-12 02:23:45 +01:00
Markolie
fc7f00baba
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-01-11 06:05:25 +01:00
Markolie
c5696683ad
Ventcrawl fix
2015-01-11 05:47:09 +01:00
Fox-McCloud
be1d527069
Borg Modules
2015-01-10 21:41:41 -05:00
Markolie
ae54430e6a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
maps/cyberiad.dmm
2015-01-10 06:24:55 +01:00
Markolie
ced499edc3
Vox Heist port from Bay
2015-01-10 06:21:21 +01:00
Fox-McCloud
bd2a59c9c2
Merge pull request #147 from Fox-McCloud/Movement-Speed-Tweaks
...
Movement speed tweaks
2015-01-09 23:02:56 -05:00
Fox-McCloud
9f24f8efd6
Movement Speed
2015-01-09 22:26:21 -05:00
DZD
95fe57f08b
Undo Possible Language Fix
...
Language Fix does not work, removing for now, to be fixed in a separate
PR.
2015-01-09 18:08:43 -05:00
DZD
fba0657487
Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port
2015-01-09 17:47:05 -05:00
Markolie
bd80867ef5
Compile fix
2015-01-09 22:06:13 +01:00
Markolie
c65c9c8a7a
Minor R&D changes, defib/IPC fix attempt 999
2015-01-09 05:37:21 +01:00
Markolie
29f5bd1b2f
Arrival comma fix
2015-01-09 00:29:57 +01:00
Markolie
2677fd587e
Bug fixes
2015-01-08 02:16:09 +01:00
DZD
7239fc2c40
Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port
2015-01-07 15:48:29 -05:00
Markolie
c1b48b40b7
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/modules/client/preferences.dm
2015-01-06 23:40:34 +01:00
Markolie
0284c9ce87
And revert the old changes
2015-01-06 22:08:36 +01:00
Markolie
faf90c3fdc
Proper drone solution (I shouldn't code at late night)
2015-01-06 22:07:42 +01:00
Markolie
0bf809eae4
Let observers join as drones instantly
2015-01-06 06:47:13 +01:00
Fox-McCloud
b90b9ad8b5
Merge pull request #131 from Markolie/master
...
Map fixes, bug fixes
2015-01-05 22:57:19 -05:00
Markolie
6ce5b379e4
Let AI transmit cryo/arrival messages when present, let AI change arrival message
2015-01-06 02:06:23 +01:00
Fox-McCloud
03c7a72a33
Undershirts
2015-01-05 16:22:47 -05:00
Fox-McCloud
ff2b7cedb2
Clothing Restructuring
2015-01-02 12:40:42 -05:00
Fox-McCloud
43af351d27
Odds and Ends
2015-01-01 21:05:50 -05:00
Fox-McCloud
a92921786f
Clothing Update
2015-01-01 11:23:48 -05:00
Fox-McCloud
a90a217290
Xeno Rebalance
2014-12-31 11:16:11 -05:00
Fox-McCloud
525bb1a96f
Stun Changes
2014-12-30 12:30:14 -05:00
Fox-McCloud
ff186408ed
Malf AI update
2014-12-24 21:23:04 -05:00
Markolie
10a2cda23c
Another attempted defib fix
2014-12-24 15:03:56 +01:00
Markolie
78d302614c
Antaghud posibrain fix
2014-12-24 14:26:37 +01:00
Markolie
5bb4a3b1fe
Minor changes
2014-12-24 13:13:49 +01:00
Markolie
b8332f1e6e
Additional autopsy data
2014-12-24 01:29:08 +01:00
Markolie
328fb13704
Attempted defib fix
2014-12-23 17:25:09 +01:00
Markolie
37fba799d6
Radio pain message fix
2014-12-23 01:23:53 +01:00
Markolie
c8db120dce
Transit tube pressure fix
2014-12-22 20:31:03 +01:00
Markolie
71a9a358e1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
maps/cyberiad.dmm
2014-12-22 15:14:35 +01:00
Markolie
47f4161fbb
Bug fixes, map fixes
2014-12-22 14:47:58 +01:00
