cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 09:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,655 Commits 26 Branches 2 Tags
892d796ca3dd668472af940c0afccc4a3075d3d4
Commit Graph

12177 Commits

Author SHA1 Message Date
Fox McCloud
9ffc341f49 Merge pull request #5274 from TheBeoni/Coats 
Removes the obligatory tie from Blueshields and Detectives coat.
 2016-08-02 13:48:13 -04:00
TheDZD
524cdde638 Merge pull request #5286 from Fox-McCloud/sound-defines 
Sound Defines
 2016-08-02 13:34:42 -04:00
Fox McCloud
db066016b2 Merge pull request #5273 from LittleBigKid2000/mourning-wood 
Fixes wooden coffins deconstructing into metal sheets
 2016-08-02 12:56:33 -04:00
Fox McCloud
dbd1cdb35a Merge pull request #5269 from GeneralChaos81/AtmosLockers 
Unique sprites for Engineers and Atmos tech lockers and wardrobes.
 2016-08-02 12:55:54 -04:00
Krausus
dba8af8ab5 Removes dels and unused code that contains dels 2016-08-02 01:33:19 -04:00
Isaac Erwin
692e961e2f Fixes wooden coffins deconstructing into metal sheets 
Sure, I /could/ fix the messages and the fact that a wooden coffin is
deconstructed with a welder, but just think of it as slicing the hinges
apart because I'm too lazy.
Also makes sarcophaguses deconstruct into sandstone, but I don't think
I've ever seen those in-game.
🆑
fix: Coffins will now deconstruct into wood instead of metal.
/🆑
 2016-08-01 23:05:50 -04:00
Fox-McCloud
ffb685b2f1 Sound Defines 2016-08-01 22:28:37 -04:00
Fox-McCloud
2e69b0eec1 Removes More Del's 2016-08-01 21:24:38 -04:00
TheDZD
bc98945c7a Merge pull request #5177 from Fox-McCloud/medical-stack-rework 
Trauma and Burn Kit Rework
 2016-08-01 21:03:07 -04:00
Fox McCloud
ec9fb331b5 Merge pull request #5241 from monster860/patch-1 
Fix ChangeTurf permanently making obscured areas obscured for AI's
 2016-08-01 20:55:13 -04:00
TheDZD
8e9850d76a Merge pull request #5222 from Crazylemon64/json_serialization2 
Lets you convert people to text and back again
 2016-08-01 20:55:08 -04:00
Fox McCloud
f0531860d4 Merge pull request #5264 from tigercat2000/seriously_fox 
Refactor stack recipes
 2016-08-01 20:44:37 -04:00
TheDZD
e35bbc4ac3 Merge pull request #5279 from Fox-McCloud/more-tweaks-to-stuff 
More Overload Lighting Performance
 2016-08-01 20:27:29 -04:00
Fox McCloud
cf8aa7e5b8 Merge pull request #5272 from yurivw/Malfspellingfix 
Fixing spelling issues in Malf AI ability desc.
 2016-08-01 20:16:01 -04:00
TheDZD
0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system 
Implements Fire System
 2016-08-01 19:39:50 -04:00
TheBeoni
67836ab234 Adds black tie to detectives locker. 2016-08-01 22:12:16 +02:00
Fox-McCloud
62a780220d More Overload Lighting Performance 2016-08-01 15:29:47 -04:00
Fox McCloud
9f7c4388dd Merge pull request #5276 from TheDZD/fecking-sounds 
Massive Playsound() Performance Improvement
 2016-08-01 14:32:55 -04:00
TheDZD
13d2c6c677 sound lag fixes 2016-08-01 14:10:09 -04:00
yurivw
345fa26439 Fixing spelling issues in Malf AI ability desc. 
I simply removed one of the C's in "Cconstruction" and added a space in
another description.
 2016-08-01 15:36:19 +02:00
GeneralChaos81
7c7d63b05f Unique sprites for Engineers and Atmos tech lockers and wardrobes. 2016-08-01 16:25:50 +10:00
Fox McCloud
b8f527febe Merge pull request #5240 from TheBeoni/PodPilot 
Adds Pod Pilot Jumpsuit
 2016-07-31 22:44:59 -04:00
Fox McCloud
31ad2a84f2 Merge pull request #5132 from Kyep/atmos_grenades 
Atmos Grenades (aka: how to kill people with atmos)
 2016-07-31 22:40:03 -04:00
Fox McCloud
5b6a13130a Merge pull request #5223 from Aurorablade/Voxpireyaya 
Alternative to #5219 :super snowflake edition
 2016-07-31 21:42: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
Crazylemon64
291fac97a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into json_serialization2 2016-07-31 12:41:32 -07: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
Kyep
bd9dea2911 Deletes old snowflake code 2016-07-31 07:56:09 -07:00
Tigercat2000
1ff1ee0af3 for(var/i in 1 to recipe_list.len) 2016-07-31 07:42:48 -07:00
Tigercat2000
221476ef3b Refactor stack recipes 
- Styling fixes
 - Added post_build() to stack recipes, for any recipes that need to do
   something special
   - Called with two arguments, the stack that it originated from, and the
     new object.
 - Moved stack recipes to their own file

Currently, only two things use post_build
 - Cablecuffs use it to color the cuffs the same as the wire they
   originated from
 - Metal rods use it to call update_icon, in order to display the correct
   sprite for whatever amount of rods you created.
 2016-07-31 07:20:26 -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
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
Krausus
a55f9d1f35 Fixes nulling of objectives lists 2016-07-30 11:55:22 -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
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
Fox-McCloud
95dcbbc77b cleaning up old code 2016-07-29 18:01:59 -04:00
Aurorablade
8df912f1d7 removes mask check 2016-07-29 17:15:16 -04:00
Fox-McCloud
731600a21f tweaks 2016-07-29 17:07:25 -04:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Kyep
4f01a05ae6 Changed Indentation 2016-07-28 22:03:55 -07:00
monster860
d575f48e20 Fix ChangeTurf permanently making obscured areas obscured for the AI 2016-07-28 22:51:22 -04:00
TheBeoni
06787dbee7 Adds Pod Pilot Jumpsuit 2016-07-29 03:43:39 +02: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