cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 15:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

287 Commits

Author SHA1 Message Date
Fox-McCloud
5216b39339 Ports TG's Weather System 2016-07-14 04:29:28 -04:00
Fox-McCloud
17be7813b8 shielded hardsuits 2016-07-07 22:39:40 -04:00
Fox-McCloud
3f31744255 Ports TG's Laughter Demon 2016-06-29 10:39:20 -04:00
TheDZD
8a8e7b8fb8 Merge pull request #4540 from CrAzYPiLoT-SS13/recyclersound 
Fixes a grave mistake
 2016-06-19 11:40:46 -04:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again 
Major Gun Refactor
 2016-06-08 22:49:10 -04:00
monster860
d61bb0b462 Fixes vulpkanin pronunciation 2016-06-02 19:50:07 -04:00
TheDZD
a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
monster860
badec759b9 Yet another batch of words 2016-05-30 16:03:05 -04:00
monster860
c7e1c50c70 Add a shitton more words. 2016-05-30 14:54:36 -04:00
Matt
a547781fb1 Fixes a grave mistake 2016-05-30 16:55:59 +02:00
monster860
7f3d120d0e Fixes kida and kidan 2016-05-30 09:40:18 -04:00
monster860
3ada6679f0 Adds species words 2016-05-30 09:25:38 -04:00
monster860
7dc7fbd2a2 Adds some new vox_fem words 2016-05-30 08:39:17 -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
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
HugoLuman
5915619c4d Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into Paradise-drask 
# Conflicts:
#	icons/mob/human_face.dmi
 2016-04-26 17:32:04 -07:00
HugoLuman
18aaaa9366 Resolves conflict in interface/stylesheet.dm 
The new stylecolor for Abductors used the same line as the Drask's

Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-20 14:44:24 -07:00
Aurorablade
d4d7535a1f kick punch 2016-04-19 16:01:03 -04:00
Fox-McCloud
efb0bb9d75 remove extras 2016-04-14 20:55:24 -04:00
HugoLuman
03323686d4 Drask files 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-12 19:00:29 -07:00
Fox-McCloud
b315879c0d New Airlock Sounds 2016-04-08 05:44:49 -04:00
TheDZD
cc98621757 Merge pull request #3986 from Fox-McCloud/shadowling-update 
Shadowling update
 2016-03-26 17:38:19 -04:00
Fox-McCloud
cf567414c2 Major Shadowling Update 2016-03-23 21:25:15 -04:00
Mieszko Jędrzejczak
135687fe7e Adds party grenades 2016-03-23 12:11:39 +01:00
TheDZD
bf371094ee Merge pull request #3817 from Fox-McCloud/screaming 
Screamtastic
 2016-03-14 17:43:29 -04:00
TheDZD
de8fb4345c Merge pull request #3836 from Fox-McCloud/chem-tweaks 
Chem tweaks
 2016-03-12 20:20:33 -05:00
TheDZD
588b533745 Merge pull request #3822 from Fox-McCloud/slot-machine 
Slot Machine Update
 2016-03-11 21:26:53 -05:00
Fox-McCloud
b6a6b54ff8 final touchups 2016-03-11 21:13:38 -05:00
Fox-McCloud
76ee7168dc part III 2016-03-10 23:03:39 -05:00
Fox-McCloud
bf74e65b80 Slot Machine Update 2016-03-10 06:09:36 -05:00
Fox McCloud
37ad1e286c Merge pull request #3806 from Tastyfish/super-fart 
Makes super fart mutation act as a spell, instead of via emote
 2016-03-10 03:55:04 -05:00
Fox-McCloud
37874af04b Screamtastic 2016-03-09 19:42:19 -05:00
TheDZD
62afa9d6d3 Merge pull request #3791 from Fox-McCloud/goon-immersion-sounds 
Implements a Few Goon Sounds
 2016-03-09 17:08:05 -05:00
Tastyfish
985a8323b1 Makes super fart mutation act as a spell, instead of happening every *fart. 2016-03-09 03:36:33 -05:00
Fox-McCloud
bc639a357c more sounds 2016-03-08 22:35:31 -05:00
Fox McCloud
953c4ba1b2 Merge pull request #3786 from TheDZD/WEEEEEOOOOOWEEEEEOOOOOWEEEEEOOOOO 
Brings Justice to the Station
 2016-03-08 20:14:43 -05:00
Fox-McCloud
2268e3c39e Implements a Few Goon Sounds 2016-03-07 23:54:12 -05:00
TheDZD
daf0c6bc31 Brings justice to the station 2016-03-07 17:50:41 -05:00
Fox-McCloud
221ff8ee08 Implements Goon's Gibbing Sounds 2016-03-06 23:05:07 -05:00
Tigercat2000
626402d4d9 Update README.md, create goonstation asset folders 
The folders exist to define the CC BY-AT-SA-NC 3.0 license on GoonStation
assets.
 2016-03-06 18:57:25 -08:00
Aurorablade
3c7281c2dd changes 2016-02-26 00:52:57 -05:00
Aurorablade
2c38d8fb61 yeah 2016-02-21 05:54:10 -05:00
Spacemanspark
4452c24999 Adds *yes and *no emotes to IPCs and other synthetics. 
Port of https://github.com/PolarisSS13/Polaris/pull/809
 2016-02-15 12:02:03 -06:00
Crazylemon64
64c92bf400 Ports Morph 
Refactors a bunch of lesser antag mobs into gamemodes/miniantags
 2016-01-15 16:31:58 -08:00
Fox McCloud
a2f944cfd9 Merge pull request #2722 from ZomgPonies/russian 
Revolver Stuff
 2016-01-11 00:18:21 -05:00
Fox-McCloud
ebdd9d3897 Timestop Spell Port and Sepia Slimes 2016-01-06 03:30:08 -05:00
Fox-McCloud
bfb23936f9 Tesla Update and Orbit Update 2015-12-24 10:29:10 -05:00
ZomgPonies
3acff9ccff Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into russian 2015-12-20 06:29:28 -05:00
Tigercat2000
42aa800393 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 
Conflicts:
	code/game/supplyshuttle.dm
	code/modules/mining/laborcamp/laborshuttle.dm
 2015-12-09 10:08:28 -08:00