cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,038 Commits 26 Branches 2 Tags
b77d200603528cf6655e48e2fa7b4e00bb202037
Commit Graph

2315 Commits

Author SHA1 Message Date
Isaac Erwin
11e86c434e Fixes talking swords being unable to their wielders, or anyone 2016-08-14 13:48:54 -04:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
Fox-McCloud
0b23e2a497 Fixes Bandolier Sprite 2016-08-10 18:57:35 -04:00
TheDZD
6d280e52de Merge pull request #5375 from Fox-McCloud/formal-captain 
Formal Captain Update
 2016-08-10 18:12:09 -04:00
Tigercat2000
58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm
 2016-08-10 14:16:42 -07:00
Crazylemon64
1b93ce9b8b Merge branch 'master' of github.com:ParadiseSS13/Paradise into space_allocation 2016-08-10 11:02:05 -07:00
Fox-McCloud
11155b261a Merge remote-tracking branch 'upstream/master' into formal-captain 2016-08-09 05:14:39 -04:00
TheDZD
f7b6928a9f Merge pull request #5355 from Fox-McCloud/malf-ai-update 
Malf AI Powers Update
 2016-08-08 21:30:12 -04:00
Fox-McCloud
0694a35da4 Formal Captain Update 2016-08-08 19:01:37 -04:00
Tigercat2000
0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/objective.dm
 2016-08-08 06:21:02 -07:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07:00
Fox-McCloud
aa1e0407d4 Illusion Simple Animals Have Attack Sounds 2016-08-08 00:20:13 -04:00
Fox-McCloud
35557881ab Malf AI Powers Update 2016-08-07 04:48:21 -04:00
Ty-Omaha
1b03ac78fd Fix 2016-08-04 19:20:19 -04:00
Chakirski
6dca3112b3 The fact this is inconsistent hurts me. 2016-08-04 11:29:26 -05:00
Crazylemon64
7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Fox-McCloud
bb30a02dd5 Better Destroys 2016-08-02 23:59:23 -04:00
Tigercat2000
9f3cdb43f7 special_role/objective refactor 
Refactored most instances of special_role setting/checking to use new
SPECIAL_ROLE_X defines in code/__DEFINES/gamemode.dm

Removed relative pathing from objective.dm and split large if statements
into multiple, plus a bunch of styling fixes

Refactored every instance of `istype(ticker.mode` into a GAMEMODE_IS_X
define in code/__DEFINES/gamemode.dm. Done primarily for when someone gets
around to making gamemode code less AWFUL
 2016-08-01 21:29:19 -07:00
Crazylemon64
bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07: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
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
0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system 
Implements Fire System
 2016-08-01 19:39:50 -04:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07: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
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
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
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
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
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
TheDZD
3061214620 Merge pull request #5205 from Fox-McCloud/librarian-qol 
Librarian QoL---Bookbag
 2016-07-28 15:12:46 -04:00
Crazylemon64
11707edff8 Now with less "t" 2016-07-27 22:49:45 -07:00
Crazylemon64
7719b58cf0 Improves serialization: Now with clothes (tm) 2016-07-27 22:26:40 -07:00
TheDZD
4cba2b8d07 Merge pull request #5154 from Fox-McCloud/more-reagent-stuff 
More Reagent Cleanup
 2016-07-26 14:24:26 -04:00
TheDZD
49ad9a565d Merge pull request #5192 from Fox-McCloud/makeshift-items 
More Makeshift Items/Weapons
 2016-07-26 13:33:16 -04:00
TheDZD
1a6ceee4bd Merge pull request #5172 from Fox-McCloud/remove-cable-coil 
Removes Cablecuffs...
 2016-07-26 13:27:59 -04:00
Fox-McCloud
c05a7d5b75 derp 2016-07-26 13:23:58 -04:00
Fox-McCloud
e06933ec09 tweakssss 2016-07-26 13:21:06 -04:00
Fox-McCloud
0a574e59fe Librarian QoL---Bookbag 2016-07-26 07:08:32 -04:00
Fox-McCloud
7f133c700d tweak 2016-07-26 04:50:22 -04:00
Fox-McCloud
0e64a91891 teleprod 2016-07-25 03:34:06 -04:00
Fox-McCloud
47b15bec0f More Makeshift Items/Weapons 2016-07-25 02:35:01 -04:00
TheDZD
4a818f865c Merge pull request #5159 from Fox-McCloud/bola 
Adds in Bola, Other Recipe Tweaks
 2016-07-24 23:37:24 -04:00
Kyep
01febeadb4 Refactor 2016-07-24 19:15:54 -07:00
Fox-McCloud
d20df994a6 Trauma and Burn Kit Rework 2016-07-23 09:36:51 -04:00