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
e6cf333e4e
Lets not forget debugging again
2014-11-27 21:33:26 +01:00
da0f915246
Fix cyborg zippo's
2014-11-27 21:19:18 +01:00
b66f3effae
Bug fixes, implements new copying/faxing system from Bay
2014-11-27 21:00:58 +01:00
c9b6d7197a
Merge pull request #532 from SamCroswell/master
...
Deathsquad Cyborgs
2014-11-27 10:43:47 -05:00
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
2700681b0c
Merge pull request #531 from SamCroswell/master
...
Projectile Laser Update
2014-11-27 01:13:18 -05:00
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
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
7dd1420f68
Makes NT Representative/Recruiter Karma locked again, SyndiBorg modtype fix.
2014-11-26 23:23:49 +01:00
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
7554748a26
Adds Mortician, vomit mask fix, fix for missing images for various jobs
2014-11-26 20:44:06 +01:00
261157cb58
AI, PDA, and Other changes
2014-11-26 01:18:49 -05:00
d95520894b
Merge pull request #525 from Markolie/master
...
Bug fixes, wording changes
2014-11-25 18:00:51 -05:00
13f0cc165d
Remove debugging
2014-11-25 23:01:49 +01:00
3be1a2553e
Bug fixes, wording changes
2014-11-25 22:56:12 +01:00
c6c089d11a
Merge pull request #521 from Markolie/master
...
Make sure alt titles have HUD icons
2014-11-23 20:56:53 -05:00
16b780cdbc
Make sure alt titles have HUD icons
2014-11-24 02:03:42 +01:00
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
0f98d78274
Merge branch 'master' of https://github.com/Markolie/Paradise
2014-11-23 22:47:46 +01:00
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
86838eaf38
Merge pull request #518 from Markolie/master
...
Add confirmation to Syndiborg
2014-11-23 06:59:39 -05:00
70f8046105
Update uplinks.dm
2014-11-23 09:56:08 +01:00
3396aafeb1
Update antag_spawner.dm
2014-11-23 09:53:47 +01:00
d4891b3d9a
Change default value for Syndiborg
2014-11-23 09:52:09 +01:00
8e44118a78
Add confirmation to Syndiborg
2014-11-23 09:35:24 +01:00
519c224611
Merge pull request #517 from FalseIncarnate/master
...
Botany Mutation Rework (RE-UPDATED)
2014-11-23 03:19:05 -05:00
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
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
269253d5d2
SyndiBorg flash removed, CentCom access update
2014-11-23 08:23:52 +01:00
74e72cdad6
Add hud icons for various jobs
2014-11-23 07:58:49 +01:00
30c1960fe8
Adds Syndiborg to NukeOps, enables shortcuts for borgs/drones, notifies the AI of borg changes
2014-11-23 07:52:38 +01:00
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
c4e97f6b72
Synicate Medibot Access Fix
...
Syndicate Medibots now require Synidcate-level access to open.
2014-11-22 17:38:37 -05:00
53cb7776b1
Map Changes, Duffelbag Fix
...
- Re-did admin room clothing storage
- Added the hammers to the weapon storage
- Replaced the unloaded mechs with loaded mechs
- Added Misc mecha equiptment next to the mechs in crates
- Replaced the Emergency NanoMed on the Syndi Ship with a SyndiMed. Same
thing, different access requirements, different icon.
- Replaced the vending machines with syndicate vending machines on the
Nukeops starting area. These require no access to use, and vend EVIL
items.
- Replaced the Syndicate DS mechs with loaded versions, as they were
unloaded.
- Removed the nonfunctional radio broadcaster on the Ruskie DJ Station.
- Fixed the captain duffelbag duplicate define.
2014-11-22 17:31:56 -05:00
2727a1143f
Merge pull request #512 from Markolie/master
...
Re-add harmbatonning, add forcesay, psych office locker
2014-11-22 15:37:38 -05:00
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
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
f43ae4a8f8
Merge pull request #511 from SamCroswell/master
...
Adds Duffelbags, Hammer Inhand Fix, Weapon Description Update
2014-11-22 13:40:10 -05:00
90bb1c5861
Weapon description update
...
Updated a few weapon descriptions to fit properly.
2014-11-22 13:33:25 -05:00
ffdd025076
Merge pull request #510 from Markolie/master
...
Syndicate teleporter fix, fix fire alarm in engineering that gets EMP'ed
2014-11-22 11:24:34 -05:00
fd064b8e35
Teleporter can no longer lock on to syndicate beacons. Teleporter/beacons can be emagged to enable syndicate option.
2014-11-22 07:54:13 +01:00
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
c0f1c92bef
Windoor damage fix, allows deconstruction of windoors
2014-11-22 06:48:51 +01:00
107325bb43
Melee attack for mechs
2014-11-22 06:05:13 +01:00
9bd63e8c84
Upping the research levels for the Phazon
2014-11-22 05:35:09 +01:00
2c2c7fc517
Constructable Phazon, constructable display case
2014-11-22 05:15:44 +01:00
0f0829ea78
Merge remote-tracking branch 'upstream/master'
2014-11-21 22:47:05 -05:00
42dd08ff7d
Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation
2014-11-22 02:24:21 +01:00
229824afc4
Fix duplicate numbers in autolathe
2014-11-22 00:59:24 +01:00
Markolie