cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,588 Commits 26 Branches 2 Tags
dbe0cbfad84f83000ef5d816cf86a659e756ccaa
Commit Graph

8205 Commits

Author SHA1 Message Date
Markolie
dbe0cbfad8 consistency 2014-11-29 02:10:32 +01:00
Markolie
ae8f08e2b8 Fixes reflection, various security level fixes, gamma armory update, communication console fixes 2014-11-29 02:05:42 +01: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
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
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
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