Commit Graph

1505 Commits

Author SHA1 Message Date
HugoLuman
718caa3f69 Removes "\The"
No more erroneous ``\The``s
I didn't touch all the ``\`` that aren't ``\n`` though, I don't know how or why it's like that or what it would do if I went through and changed it.
2016-05-15 19:48:43 -07:00
HugoLuman
230b220d5c Addresses https://github.com/ParadiseSS13/Paradise/issues/4434
Makes the description for the dehydrated space carp in the syndicate uplink menu more accurate and informative. It now reads:
"Just add water to make your very own hostile to everything space carp. It looks just like a plushie.
The first person to squeeze it will be registered as its owner, who it will not attack. If no owner is registered, it'll just attack everyone."

The previous description did not provide players enough information to use the item correctly.

:cl:HugoLuman
fix: Makes dehydrated space carp description more accurate and informative
/🆑
2016-05-15 17:51:44 -07:00
Fox McCloud
3ee2e470a1 Merge pull request #4331 from KasparoVy/voxhair
Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Fixes/Refactors Morph + Features to Morph and CMA...
2016-05-13 15:36:34 -04:00
Tastyfish
b77541bc9b Fixes a couple runtimes and weird add_reagents/add_reagents_list that was silly 2016-05-12 19:22:07 -04:00
TheDZD
015af5519e Merge pull request #4391 from Fox-McCloud/objectives
TG Traitor Objectives Assignment
2016-05-10 22:41:49 -04:00
KasparoVy
13003fe351 Merge branch 'temp2' into temp 2016-05-10 00:10:15 -04:00
TheDZD
70a2d982f5 Merge pull request #4395 from Fox-McCloud/meme-box
His Grace
2016-05-09 19:17:49 -04:00
Fox-McCloud
4d0c3361cc His Grace 2016-05-08 09:10:25 -04:00
Fox-McCloud
a40460a365 TG Traitor Objectives Assignment 2016-05-07 22:28:57 -04:00
Fox McCloud
cd3381d0a0 Merge pull request #4356 from FalseIncarnate/botany
Briefcase Full of BEES!
2016-05-06 23:28:11 -04:00
Fox-McCloud
45fc535203 A Few More Disease and Reagents 2016-05-05 00:46:04 -04:00
FalseIncarnate
9a39567189 Briefcase Full of BEES!
The situation has only been made worse by the addition of yet more bees!

Adds the brand new botanist traitor item: BRIEFCASE FULL OF BEES!
- Just your average briefcase by looks, but don't be fooled, this
briefcase contains Syndicate-bred bees intent on ruining days.
- Botanist-only traitor item, 10 TC
- On use, it actually ANNOUNCES ITSELF to the station with a
station-wide intercomm broadcast of DR. BEES!
- The sound clip has a cooldown. Releasing the bees does not.
- Comes loaded with 10 bees, releasing up to 5 bees per use
- Inject blood into the briefcase to train the bees still inside (not
ones already released) to NOT attack the donor(s)
- There is no way to put bees back into the case, but rumors abound of a
reagent that can replicate syndi-bees. How strange...

Refactors bee code a bit, and makes normal bees less murder-y
- Fixes #4306

Adds new bee type: Syndi-bee
- Never returns home
- Never pollinates
- More health and slightly more damage
- Normal bees: 10 hp, 1 damage. Syndi-bees: 25 hp, 5 damage
- Always injects Flurosulphiric acid into its victims... EVEN THOSE IN
HARDSUITS
2016-05-05 00:12:44 -04:00
TheDZD
7d6986a650 Merge pull request #4346 from Fox-McCloud/overdose-rework
Overdose Rework and Food Poisoning
2016-05-04 20:52:37 -04:00
Fox-McCloud
08ec1db17e food poisoning 2016-05-04 19:58:44 -04:00
KasparoVy
a5b32d819d Fixes Bugs where Alopecia and Facial Hypertrichosis Wouldn't Update Sprite Correctly 2016-05-04 02:48:05 -04:00
Fox McCloud
c70c8d9c39 Merge pull request #4304 from Aurorablade/JustTraitorThings
Crazy Fethas Traitor Emporium of Horrors
2016-05-04 01:22:13 -04:00
Aurorablade
37d9cc49dc removes from uplink until fixed
renames old sniper icons to esniper and new sniper to just sniper
2016-05-04 00:34:28 -04:00
Fox-McCloud
b295e7809e Overdose Rework 2016-05-03 19:55:11 -04:00
Aurorablade
5f0dde2f65 Apprently this ammo isn't a thing on TG anymore 2016-05-02 23:25:46 -04:00
TheDZD
5435084dc7 Merge pull request #4328 from Fox-McCloud/tesla-update
Tesla Update/Rebalance
2016-05-01 12:52:40 -04:00
Aurorablade
dbc65dc7ec tweaks on feedback 2016-04-30 16:04:56 -04:00
TheDZD
5ca5cff788 Merge pull request #4320 from IK3I/Tox-Comp-Fix
Adds check for synthetic parts in tox-comp
2016-04-30 09:34:55 -04:00
KasparoVy
f95655419c Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Adjusts Vox Hairstyle Names for Consistency -- PASS 1
Also fixes a typo or two.

TO DO: FULLY TEST AND SWEEP FOR BUGS, ERRORS AND RUNTIMES
2016-04-30 08:12:41 -04:00
Fox-McCloud
8322aa9338 Tesla Update/Rebalance 2016-04-30 06:44:01 -04:00
Crazylemon64
f8ce4e5fb2 Traitor panel now properly removes special role from deculted cultists 2016-04-30 03:10:37 -07:00
IK3I
8d18ce19df Incorporates Suggestions for code format
Redoes get_damaged_organs() to use defines and flags instead of strings.
2016-04-29 21:43:19 -05:00
Aurorablade
7e405427aa changess 2016-04-29 02:09:05 -04:00
Aurorablade
7a99d8fe74 Crazy Fethas Traitor Emporium of Horrors 2016-04-27 19:09:21 -04:00
Fox McCloud
110958860b Merge pull request #4270 from FlattestGuitar/foamforce
Ports /tg/ FOAM FORCE
2016-04-27 11:43:55 -04:00
Mieszko Jędrzejczak
0f7be5576f Gunshot sounds, uplink references, less spammy tommygun, fixes 2016-04-25 11:32:48 +02:00
Mieszko Jędrzejczak
03c173aeaf Lowers costs, adds darts to autolathe 2016-04-24 09:19:03 +02:00
Aurorablade
cb38f7b0f9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Kungfu 2016-04-22 21:45:18 -04:00
Mieszko Jędrzejczak
5cf3f25892 Ports /tg/ Foam Force guns 2016-04-22 23:35:55 +02:00
Fox McCloud
7594206d16 Merge pull request #4261 from Tastyfish/vampfix
Fixes devamping via the traitor panel
2016-04-21 20:15:19 -04:00
Tastyfish
b798e7ef18 Fixes devamping in traitor panel 2016-04-21 19:58:49 -04:00
Aurorablade
991976fbcb before tiger kills me... 2016-04-19 17:30:13 -04:00
Fox-McCloud
87a9f30bd4 Part 6 2016-04-18 05:32:41 -04:00
Fox-McCloud
fe170db7bb part 3 2016-04-17 10:35:10 -04:00
Fox-McCloud
2453735d3f part 2 2016-04-17 00:21:31 -04:00
Aurorablade
2d85f582e1 martial arts shit 2016-04-16 22:22:21 -04:00
Fox-McCloud
f817351d2a part1 2016-04-16 10:40:21 -04:00
Fox McCloud
7700d224a3 Merge pull request #4202 from Crazylemon64/rubber_stamps_are_bureaucracy
Adds granted and denied stamps to the bureaucracy crate
2016-04-15 20:17:35 -04:00
TheDZD
5259dc6b1a Merge pull request #4138 from Fox-McCloud/door-sounds
New Airlock Sounds
2016-04-14 22:44:54 -04:00
TheDZD
eba294357a It's the bees 2016-04-14 20:30:30 -04:00
Crazylemon64
880056a87d Adds granted and denied stamps to the bureaucracy crate 2016-04-14 08:22:37 -07:00
TheDZD
b0fd688ed5 Merge pull request #4190 from Meisaka/fix-law
Fix Malf Law in Law manager
2016-04-13 16:24:57 -04:00
Meisaka Yukara
80b8aee935 Replace format code 2016-04-14 03:21:23 +09:00
Fox McCloud
dab1303d46 Merge pull request #4150 from Tastyfish/away-reorder
Updates maploader code to be in line with tg's, startup improvements
2016-04-11 19:41:22 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
TheDZD
9ecf552708 Merge pull request #4127 from Fox-McCloud/traitor-vamp
Traitor Vamp
2016-04-09 22:17:15 -04:00