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
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
2f7dafda93
Sparkyninja's beret
2014-11-24 03:30:03 +01: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
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
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
Markolie
30c1960fe8
Adds Syndiborg to NukeOps, enables shortcuts for borgs/drones, notifies the AI of borg changes
2014-11-23 07:52:38 +01:00
SamCroswell
ceabc46f1b
Dismemberment Update, Fire Axe Fixes, Gun Sounds
2014-11-23 00:52:32 -05:00
Fox-McCloud
99c7c4b667
Merge pull request #493 from nicky89107/master
...
Gibbing sound effects and screams + clarifying admin OOC color verb's name.+ Machine people *buzz *ping and *beep emotes -Tigercat2000
2014-11-22 21:38:03 -05:00
Fox-McCloud
2727a1143f
Merge pull request #512 from Markolie/master
...
Re-add harmbatonning, add forcesay, psych office locker
2014-11-22 15:37:38 -05:00
Markolie
dd70ba2030
Adds a psychiatrist's locker to the psychiatrist's locker, with a straight jacket, syringe and a pill bottle with 2x Citalopram and 2x Methylphenidate
2014-11-22 20:58:26 +01:00
Markolie
e9fc80fe7f
Re-add harmbatonning. Adds forcesay: if you're typing when you get hit by a stun weapon, you say a garbled version of what you were typing (from /tg/).
2014-11-22 20:22:28 +01:00
Fox-McCloud
f43ae4a8f8
Merge pull request #511 from SamCroswell/master
...
Adds Duffelbags, Hammer Inhand Fix, Weapon Description Update
2014-11-22 13:40:10 -05:00
SamCroswell
90bb1c5861
Weapon description update
...
Updated a few weapon descriptions to fit properly.
2014-11-22 13:33:25 -05:00
Fox-McCloud
222e26e23f
Merge pull request #508 from Markolie/master
...
Fixes grilles, constructable machine upgrade, proper hardsuit conversion, R&D updates, constructable display case
2014-11-22 00:57:02 -05:00
Markolie
107325bb43
Melee attack for mechs
2014-11-22 06:05:13 +01:00
Markolie
9bd63e8c84
Upping the research levels for the Phazon
2014-11-22 05:35:09 +01:00
Markolie
2c2c7fc517
Constructable Phazon, constructable display case
2014-11-22 05:15:44 +01:00
DZD
0f0829ea78
Merge remote-tracking branch 'upstream/master'
2014-11-21 22:47:05 -05:00
Markolie
42dd08ff7d
Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation
2014-11-22 02:24:21 +01:00
Markolie
e0234565bc
Remove the duplicate decloner
2014-11-22 00:37:55 +01:00
Markolie
1269fe7d4e
Fix encryption key name
2014-11-21 23:58:13 +01:00
Markolie
7415d1be99
Add the decloner to R&D
2014-11-21 21:50:01 +01:00
Markolie
3d806081d0
Let protolathe's be loaded with chemicals again, let circuitprinter drop chemicals when deconstructed
2014-11-21 21:39:43 +01:00
Markolie
5b3df5a690
Fix names of scanning modules
2014-11-21 19:40:31 +01:00
Tigercat2000
08016a957d
Adds Machine-People specific *buzz *ping and *beep emotes.
2014-11-20 21:36:10 -08:00
Tigercat2000
067d9565e3
Changes the button for admin OOC color to be descriptive of such. "OOC
...
Text Color" to "Personal OOC Text Color"
2014-11-20 20:13:31 -08:00
Markolie
06b0a7a89f
Re-add Dave's changes, nerf remote view/remote talk
2014-11-21 00:17:52 +01:00
Markolie
d8f568494d
Let AI state laws over specified channel, lets borgs state laws
2014-11-20 22:27:47 +01:00
Markolie
e2e996fbbf
Glass now changes color when built based on the area, map fixes
2014-11-20 00:08:29 +01:00
Markolie
59edf2701d
Makes SMES'es and Vending Machines constructable and upgradeable, gives borgs recorders
2014-11-18 20:36:40 +01:00
Markolie
4115c98d9d
Glass instead of wood for bottles
2014-11-18 17:34:01 +01:00
Markolie
3e67587869
Allows the freezer/heater to actually be connected, minor machine fixes, janitor mop fix, drone can now clean bottles
2014-11-18 17:31:43 +01:00
Markolie
2f7d3ae26d
Additional constructable and upgradeable machines, adds soap to drones, updates teleporter
2014-11-18 03:13:12 +01:00
Mark van Alphen
f1278b799d
Merge pull request #1 from ZomgPonies/master
...
Upstream merge
2014-11-17 08:48:31 +01:00
