Commit Graph

5039 Commits

Author SHA1 Message Date
Markolie 0dc52900cc Adds the service channel (:v) 2014-11-29 21:01:19 +01:00
Fox-McCloud f85def5f09 Hug Nerf 2014-11-29 10:09:57 -05:00
Fox-McCloud 3b884622c5 Job Changes 2014-11-29 09:10:31 -05:00
Markolie 35fa4600e7 Merge branch 'master' of https://github.com/Markolie/Paradise 2014-11-29 02:39:45 +01:00
Markolie ae8f08e2b8 Fixes reflection, various security level fixes, gamma armory update, communication console fixes 2014-11-29 02:05:42 +01:00
Fox-McCloud 0128878100 Merge pull request #535 from Fox-McCloud/Species-Guns
Species guns
2014-11-28 19:24:55 -05:00
Fox-McCloud a4c72d4603 Species and Guns 2014-11-28 19:13:41 -05:00
Markolie 7e544c17bc Fix DNA Injectors with abilities, adds mob's name to autopsy data 2014-11-28 21:14:00 +01:00
Markolie df5d569bb1 Minor borg fix 2014-11-28 01:40:58 +01:00
Markolie a34d283aab Cloning and deathsquad fixes 2014-11-28 01:33:36 +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 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
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
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 3be1a2553e Bug fixes, wording changes 2014-11-25 22:56:12 +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
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 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
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
Markolie 107325bb43 Melee attack for mechs 2014-11-22 06:05:13 +01:00
Markolie 42dd08ff7d Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation 2014-11-22 02:24:21 +01:00
Tigercat2000 08016a957d Adds Machine-People specific *buzz *ping and *beep emotes. 2014-11-20 21:36:10 -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 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
Markolie 876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +01:00
Markolie b0963fa860 Slime runtime error fixes, minor map fixes 2014-11-15 05:02:10 +01:00
Markolie cbe2bee4c2 Crazy amount of map fixes. 2014-11-15 01:39:00 +01:00