cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-19 05:53:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,574 Commits 27 Branches 2 Tags
c9f6bc7e2cf06aeab40ee4ce9d044971ceeee32f
Commit Graph

22715 Commits

Author SHA1 Message Date
Fox McCloud
c9f6bc7e2c Merge pull request #5243 from Aurorablade/CrebSnipSnip 
Readds Glove snipping
 2016-07-31 21:41:15 -04:00
Fox McCloud
6cd6ab82fa Merge pull request #5259 from yurivw/master 
captain to Captain
 2016-07-31 16:30:17 -04:00
Yuri van Wijnen
d897795499 Update supervisor.dm 
Removed the capitalization on the supervisors.
 2016-07-31 22:24:37 +02:00
Fox McCloud
4c40a74746 Merge pull request #5254 from Crazylemon64/space_allocation 
Updates space transitions and integrates it with the space management module
 2016-07-31 12:18:19 -04:00
TheDZD
6a5b52b93c Merge pull request #5261 from Fox-McCloud/no-docking 
Removes Docking Controllers
 2016-07-31 12:10:26 -04:00
TheDZD
5b447d92c3 Merge pull request #5263 from Kyep/hypo_fix 
Fixes Hypospray Theft Objective
 2016-07-31 12:09:52 -04:00
TheDZD
026a28f9e7 Merge pull request #5250 from Krausus/biconclassfix 
Fixes Weirdly Specific View Variables Crashes Somehow
 2016-07-31 11:44:54 -04:00
Kyep
bd9dea2911 Deletes old snowflake code 2016-07-31 07:56:09 -07:00
Kyep
9b317be92e Fixes CMO Hypospray Theft Objective 2016-07-31 02:41:48 -07:00
Fox McCloud
13ba6b6429 Merge pull request #5255 from IcyV/Electric-Axe-2--Electric-Boogaloo 
Gives Atmos-Traitors a new fireaxe.
 2016-07-31 00:48:06 -04:00
Fox-McCloud
54663eba05 Removes Docking Controllers 2016-07-31 00:16:43 -04:00
Fox McCloud
a81ebc2007 Merge pull request #5253 from chopchop1614/deta 
Fixes exploding backpacks
 2016-07-30 18:47:42 -04:00
Fox McCloud
3ae033ee41 Merge pull request #5257 from Krausus/NullObjectiveFix 
Fixes Round-End Objective List Runtimes
 2016-07-30 18:46:57 -04:00
Fox McCloud
634da17cb8 Merge pull request #5244 from TullyBurnalot/BugFixQuest1 
ATMs can have fingerprints
 2016-07-30 18:46:10 -04:00
yurivw
2b34a68f50 captain to Captain 
Changed the text from: "All hands, captain" to "All hands, Captain."

The supervisors are now also proprly capitalised.
 2016-07-30 23:54:07 +02:00
Crazylemon64
652c1bbecf Makes a certain tiger pre-emptively happy 2016-07-30 14:15:17 -07:00
Krausus
a55f9d1f35 Fixes nulling of objectives lists 2016-07-30 11:55:22 -04:00
Krausus
545660f474 Fixes late-join window's round duration 2016-07-30 02:27:58 -04:00
IcyV
da360c8703 Gives Atmos-Traitors a new fireaxe. 
Give Atmos-traitors a unique 10TC axe to buy.

This axe starts with a single charge and can gain more charges over time
by destroying windows and grilles. Each grille or window destroyed has a
4% chance of giving another charge to the axe. On a charged hit the axe
will hit for 30 brute and 30 burn. It will otherwise function as a
normal fireaxe if out of charges.

![nknwxga](https://cloud.githubusercontent.com/assets/6348574/17047510/9ab3c986-4f93-11e6-83b8-c3e4598704eb.gif)

Sprites courtesy of Fullofskittles
🆑 IcyV
add: Adds a unique axe for Atmos-traitors
/🆑
 2016-07-29 21:08:50 -07:00
Crazylemon64
ffc1877195 Fixes a minor hiccup 2016-07-29 19:39:17 -07:00
Crazylemon64
af5d42a5a4 You're not supposed to be there 2016-07-29 19:21:09 -07:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Taylor Wood
869c13e493 Fixes exploding backpacks 2016-07-29 23:05:59 +01:00
Aurorablade
0cb31c70c2 Mangled fingerless gloves 
or fethas attempts to address black gloves
 2016-07-29 18:05:48 -04:00
Krausus
f4e824e4c3 Adds no-class mode to bicon proc 
... and makes the bicons in View Variables use it. This seems to stop a
small number of icon state classes from breaking Dream Seeker when
directly browsed to a client. I don't actually understand why, but it
works.
 2016-07-29 09:00:07 -04:00
TullyBurnalot
7ef79222ae Removes pointless src. Again 2016-07-29 10:24:14 +01:00
TullyBurnalot
96dbc5eaa7 Can leave fingerprints on ATMs 2016-07-29 07:31:16 +01:00
Aurorablade
5e54f38103 FOOOOOOOOOOOOOOXXXXXXXXXXXXXXXXXXXXXXXXXXXX 2016-07-28 23:58:25 -04:00
Crazylemon64
94c0bbff6a Something to show to DZD 2016-07-28 19:07:02 -07:00
Tigercat2000
288af9f92c Revert "Merge pull request #4739 from monster860/vg-parallax" 
This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
 2016-07-28 15:48:27 -07:00
TheDZD
75a8ac632c Merge pull request #5203 from Krausus/SpookyAdminClicks 
Adds Admin Ghost Click Shortcuts
 2016-07-28 17:09:21 -04:00
Krausus
56f6b3a14e Adds multi-mob warning to admin click shortcuts 
Also, cleans up admin_mob_info code a bit
 2016-07-28 17:02:46 -04:00
monster860
b2cb87edc9 Merge branch 'master' into vg-parallax 2016-07-28 16:45:10 -04:00
TheDZD
3600a9d4b8 Merge pull request #5150 from FreeStylaLT/nocturnegank 
Adds electrical grid check to random events.
 2016-07-28 16:13:24 -04:00
TheDZD
36e7ab6251 Merge pull request #5204 from Fox-McCloud/virology-tweaks 
Virology Tweaks
 2016-07-28 15:40:23 -04:00
Fox-McCloud
4dad99025a better desc 2016-07-28 15:21:14 -04:00
TheDZD
3061214620 Merge pull request #5205 from Fox-McCloud/librarian-qol 
Librarian QoL---Bookbag
 2016-07-28 15:12:46 -04:00
TheDZD
407cf4c695 Merge pull request #5206 from Kyep/equip_vox 
Select Equipment: Vox / Greytide / Soviet Edition
 2016-07-28 15:10:37 -04:00
Fox McCloud
ea2455625e Merge pull request #5211 from Ty-Omaha/Tacticool 
Gives Code Red ERT Combat Gloves
 2016-07-28 15:03:31 -04:00
Fox-McCloud
eb43f01995 Fixes Blob, Again 2016-07-28 12:12:52 -04:00
TheDZD
25c7797e77 Merge pull request #5212 from Kyep/cryopod_fix 
Fixes cryopod bug
 2016-07-28 09:13:24 -04:00
Kyep
eb0d3f7558 Fixes cryopod bug 2016-07-27 00:21:45 -07:00
Kyep
9d9d16a0a0 Admiral Headset 2016-07-27 00:09:12 -07:00
Kyep
8a5743591c Adds Mime Assassin, Tweaks 
1) Adds Mime Assassin, counterpart to Tunnel Clown
2) Fixes backpack/internalsbox for some outfits
3) Fixes survivor/greytide lack of flashlight
4) Fixes xeno lack of gas mask
5) Fixes soviet soldier double-mateba, excessive c4, but insufficient
ammo
5) Fixes soviet admiral lack of ammo
 2016-07-26 22:10:18 -07:00
Ty-Omaha
35d7ef97a2 ERT Gloves 2016-07-26 23:22:26 -04:00
Fox McCloud
bff1335a8b Merge pull request #4996 from TullyBurnalot/AIFixer 
AI Integrity Restorer EMP Rework
 2016-07-26 22:49:04 -04:00
TullyBurnalot
cdb1778c55 Removes returns, adds Destroy() 2016-07-27 00:38:22 +01:00
TheDZD
4cba2b8d07 Merge pull request #5154 from Fox-McCloud/more-reagent-stuff 
More Reagent Cleanup
 2016-07-26 14:24:26 -04:00
Fox McCloud
6fc0435c05 Merge pull request #5155 from Twinmold93/voxkillcount 
Vox Raider Check Kills for Inviolate
 2016-07-26 14:22:53 -04:00
TheDZD
7616a33df4 Merge pull request #5162 from Crazylemon64/boom_buildmode 
Adds an explosion buildmode
 2016-07-26 14:13:37 -04:00