Markolie
f62cb59ad7
Default stunbaton back to 1500
2014-11-28 01:37:05 +01:00
Markolie
a34d283aab
Cloning and deathsquad fixes
2014-11-28 01:33:36 +01:00
Markolie
87fb604761
Fix Supermatter message spam
2014-11-27 23:05:31 +01:00
Markolie
3b1dc8e487
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
...
Conflicts:
icons/obj/weapons.dmi
maps/cyberiad.dmm
2014-11-27 21:39:01 +01:00
Markolie
e6cf333e4e
Lets not forget debugging again
2014-11-27 21:33:26 +01:00
Markolie
da0f915246
Fix cyborg zippo's
2014-11-27 21:19:18 +01:00
Markolie
b66f3effae
Bug fixes, implements new copying/faxing system from Bay
2014-11-27 21:00:58 +01:00
Fox-McCloud
c9b6d7197a
Merge pull request #532 from SamCroswell/master
...
Deathsquad Cyborgs
2014-11-27 10:43:47 -05:00
SamCroswell
672cf362e0
CentComm Borg Access Fix
...
Now requires specops access. I'm a goof.
2014-11-27 09:58:42 -05:00
SamCroswell
5d6abde5ed
Deathsquad Cyborgs
...
Adds Deathsquad cyborgs. The only reason these really exist is because I
was bored, but hey! They come equipped with the latest in adminboos
gear, including a fully functional pulse rifle and esword, and a cell
that has 50,000 energy! What could go wrong?
2014-11-27 01:38:52 -05:00
Fox-McCloud
2700681b0c
Merge pull request #531 from SamCroswell/master
...
Projectile Laser Update
2014-11-27 01:13:18 -05:00
Fox-McCloud
194711fef6
Merge pull request #530 from Markolie/master
...
The Mortician's labcoat can now be (un)buttoned
2014-11-26 20:58:35 -05:00
SamCroswell
8b16d394ed
Projectile Laser Update
...
Lasers are now projectiles instead of instant beams. Fire delay removed,
damages adjusted accordingly.
2014-11-26 19:16:21 -05:00
Markolie
6cfea53224
The Mortician's labcoat can now be (un)buttoned
2014-11-26 23:43:50 +01:00
Fox-McCloud
f7c0acb0e2
Merge pull request #529 from Markolie/master
...
Makes NT Representative/Recruiter Karma locked again, SyndiBorg modtype fix
2014-11-26 17:32:42 -05:00
Markolie
7dd1420f68
Makes NT Representative/Recruiter Karma locked again, SyndiBorg modtype fix.
2014-11-26 23:23:49 +01:00
Tigercat2000
bfcbb5fc17
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-11-26 13:28:52 -08:00
Tigercat2000
7e02544db4
Removes debugging broadcast from force-say.
2014-11-26 13:27:50 -08:00
Fox-McCloud
7e9f669f44
Merge pull request #527 from Markolie/master
...
Adds Mortician, vomit mask fix, fix for missing images for various jobs
2014-11-26 15:14:52 -05:00
Markolie
7554748a26
Adds Mortician, vomit mask fix, fix for missing images for various jobs
2014-11-26 20:44:06 +01:00
Fox-McCloud
261157cb58
AI, PDA, and Other changes
2014-11-26 01:18:49 -05:00
Fox-McCloud
d95520894b
Merge pull request #525 from Markolie/master
...
Bug fixes, wording changes
2014-11-25 18:00:51 -05:00
Markolie
8ef2d4d441
Description fix
2014-11-25 23:37:56 +01:00
Markolie
202019bb05
Shift-clicking as AI's/borgs now examines
2014-11-25 23:36:42 +01:00
Markolie
13f0cc165d
Remove debugging
2014-11-25 23:01:49 +01:00
Markolie
3be1a2553e
Bug fixes, wording changes
2014-11-25 22:56:12 +01:00
Fox-McCloud
484c10d9bf
Merge pull request #522 from Markolie/master
...
Re-add the Singuloth Knight's hardsuit
2014-11-24 22:05:54 -05:00
DZD
ec98c3036f
Missing Slime Reactions
...
Sepia, Cerulean, Bluespace, and Pyrite slimes now have reactions.
2014-11-24 20:01:54 -05:00
Markolie
759b6b6855
Re-add the Singuloth Knight's hardsuit.
2014-11-24 21:11:31 +01:00
Fox-McCloud
fb4d40f9f2
Merge pull request #466 from melandor0/paradise
...
supermatter drill
2014-11-23 21:49:06 -05:00
melandor0
6dec83b98c
-SM drill
...
commented out the supermatter drill until we can find a use for it/a way
to balance it
2014-11-24 03:41:46 +01:00
melandor0
2f7dafda93
Sparkyninja's beret
2014-11-24 03:30:03 +01:00
Fox-McCloud
c6c089d11a
Merge pull request #521 from Markolie/master
...
Make sure alt titles have HUD icons
2014-11-23 20:56:53 -05:00
Fox-McCloud
b41026c4e6
Merge pull request #514 from SamCroswell/master
...
Dismemberment Update, Fireaxe Fixes, Gunshot Sound Changes
2014-11-23 20:56:27 -05:00
melandor0
72196cd272
Merge pull request #119 from ZomgPonies/master
...
sync
2014-11-24 02:45:57 +01:00
Markolie
16b780cdbc
Make sure alt titles have HUD icons
2014-11-24 02:03:42 +01:00
Fox-McCloud
549cf1f2b8
Merge pull request #520 from Markolie/master
...
Adds podbay doors that can be opened from within pods, general map fixes
2014-11-23 18:04:42 -05:00
Markolie
2d36851119
Syndicate hardsuit helmet fix, SyndiBorg PDA fix
2014-11-23 23:52:13 +01:00
SamCroswell
70ee0cff3e
Dismemberment, Part 2: Explosive Act
...
Humans now dismember similar to how they did before when an explosion
hits them. The higher the severity and the less bomb armor they have,
the greater the chance they loose more limbs.
2014-11-23 17:47:08 -05:00
Markolie
0f98d78274
Merge branch 'master' of https://github.com/Markolie/Paradise
2014-11-23 22:47:46 +01:00
Markolie
3a9d45c2d6
Adds podbay doors to the pods that can be opened using the button, or from within the pod. Also includes other map fixes.
2014-11-23 22:44:00 +01:00
Fox-McCloud
86838eaf38
Merge pull request #518 from Markolie/master
...
Add confirmation to Syndiborg
2014-11-23 06:59:39 -05:00
Mark van Alphen
70f8046105
Update uplinks.dm
2014-11-23 09:56:08 +01:00
Mark van Alphen
3396aafeb1
Update antag_spawner.dm
2014-11-23 09:53:47 +01:00
Mark van Alphen
d4891b3d9a
Change default value for Syndiborg
2014-11-23 09:52:09 +01:00
Markolie
8e44118a78
Add confirmation to Syndiborg
2014-11-23 09:35:24 +01:00
Fox-McCloud
519c224611
Merge pull request #517 from FalseIncarnate/master
...
Botany Mutation Rework (RE-UPDATED)
2014-11-23 03:19:05 -05:00
FalseIncarnate
a7c63e4a06
Botany Mutation Rework
...
Reworked the mutation system for Botany to use a "tier system",
adjusting mutation chances and the potential type of mutation based on
the amount of the reagent(s) added.
Updated handling for Floral Somatoray to work properly with new Botany
Mutation Rework.
Adjusted Floral Somatoray's Yield setting to adjust the yield stat of
the plant instead of yield_mod stat of the tray.
Also added additional information to the Plant Analyzer when scanning
trays. Will now include information such as age, yield modifier, and
toxicity in the report. This will not be shown when scanning harvested
goods or seeds.
Fixed some typos and missing words in podmen.dm in preparation of
planned attempt to reintegrate pod-cloning functionality.
Fixed hydroponics trays setting "waterlevel = maxwater" and "nutrilevel
= 3" whenever RefreshParts() is called, and fixed sanity check for water
and nutrients above previous max levels.
Unreported change from my previous commit (this is for the sake of
documentation): End of round score will factor Hydroponics harvests into
the calculations.
2014-11-23 03:14:21 -05:00
Fox-McCloud
2f25e4f162
Merge pull request #515 from Markolie/master
...
Adds Syndiborg to Nuke Ops, enables shortcuts for borgs/drones, notifies the AI of borg changes
2014-11-23 02:25:40 -05:00
Markolie
269253d5d2
SyndiBorg flash removed, CentCom access update
2014-11-23 08:23:52 +01:00
