cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-04 13:03:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,378 Commits 15 Branches 2 Tags
7861df4dbe98b6592f5792d052d768c2b40d3622
Commit Graph

3857 Commits

Author SHA1 Message Date
Crazy Lemon 09f7b52f3b Merge pull request #6906 from Fox-McCloud/merge-oddities 
Fixes Stack Merge Oddities
 2017-03-26 23:27:58 -07:00
Fox McCloud 9102a40579 Merge pull request #6933 from Ty-Omaha/Fixes17 
Fixes grammar issue when applying splints
 2017-03-26 19:08:17 -04:00
Fox McCloud 88ae43709f Merge pull request #6913 from SamHPurp/Unlocked-APCs 
Quality of Life: Newly built APCs come unlocked.
 2017-03-26 18:24:10 -04:00
Ty-Omaha b0d8c819e6 Swaps them 2017-03-25 14:26:27 -04:00
Fox McCloud bce6befcd1 Merge pull request #6770 from KasparoVy/tools-inhands 
Fixes and Adds some Inhand Icons for Tools, TG Tool Inhand Sprite Parity
 2017-03-24 19:00:34 -04:00
Fox McCloud 456b1ad6a6 Merge pull request #6795 from uraniummeltdown/silver 
Plain and Fancy Gold and Silver Tiles
 2017-03-24 18:58:09 -04:00
Sam dba6c293c7 Increases the number of construction permits 2017-03-24 21:26:38 +00:00
uraniummeltdown 4762c96779 fixed metal rods max amount error, added old gold tile sprites, added recipes for gold and silver tiles to change them into fancy versions 2017-03-24 14:10:17 +04:00
Fox-McCloud 9ed89ef7cd Fixes Stack Merge Oddities 2017-03-24 04:44:04 -04:00
Crazy Lemon 87e4993152 Merge pull request #6717 from Fox-McCloud/laser-scalpel-refactor 
Fixes Power Tools Materials and Recators Laser Scalpels
 2017-03-23 15:20:56 -07:00
Fox McCloud d62e35d333 Merge pull request #6647 from Kyep/nerf_chaplain 
Nerfs Validhunting Chaplains
 2017-03-23 00:18:16 -04:00
Crazy Lemon a3df2d2eb5 Merge pull request #6851 from Fox-McCloud/cleaning 
Spring Cleaning
 2017-03-22 21:16:52 -07:00
FlattestGuitar c1fcb9a87c < 2017-03-22 09:24:03 +01:00
KasparoVy eb43a48f67 Resolves conflicts with baseball PR. 2017-03-21 16:16:16 -04:00
Fox-McCloud 037db0bdf7 Spring Cleaning 2017-03-21 14:43:53 -04:00
Fox McCloud 8a257e425e Merge pull request #6789 from uraniummeltdown/playball 
Baseball Bats, Baseball Burgers
 2017-03-21 14:38:03 -04:00
Fox McCloud 472bd7b887 Merge pull request #6813 from SamHPurp/fixes-vent-text 
Fixes
 2017-03-20 16:39:10 -04:00
Sam e43cb810a8 More bits wew. 2017-03-20 06:37:56 +00:00
Sam 343d466287 Reverts NanoTrasen edits following convo with Fox/Regen 2017-03-19 21:31:42 +00:00
Sam db89c499ce Fixes some capitalisation stuff... 
Pedantry!
 2017-03-19 01:09:47 +00:00
uraniummeltdown cd6b6a61d7 added dog beds craftable from 10 wood planks 2017-03-17 17:46:04 +04:00
uraniummeltdown 5180002295 add baseball bat item for 5 wood sheets, baseball burger, admin only reflector bat and homerun bat 2017-03-16 22:33:24 +04:00
uraniummeltdown b686cad0ce robo hands aren't affected by shard cutting into hand 2017-03-16 16:20:46 +04:00
uraniummeltdown 6ca139974d glass shards now deal brute to your hand if not wearing gloves 2017-03-15 19:39:54 +04:00
Fox McCloud 6bfd4013c0 Merge pull request #6753 from uraniummeltdown/grilles 
Grille Code Update
 2017-03-15 07:48:17 -04:00
Fox McCloud c6e3fe3cdb Merge pull request #6734 from uraniummeltdown/plastic 
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
 2017-03-15 06:33:02 -04:00
KasparoVy cdc07fac4a Also fixes red crowbar's inhands being the wrong one. 2017-03-14 16:16:37 -04:00
uraniummeltdown 70c2a27d16 Merge branch 'master' into grilles 2017-03-12 16:52:13 +04:00
uraniummeltdown 2af6b1de23 grille code updates from tg, removed attack_self() from rods they now use recipes, refactored grille (de)construction, added broken grille object for mapping, grilles can be damaged by throwing objs or mobs at them, also general code cleanup 2017-03-12 16:35:24 +04:00
Fox McCloud 0fe2a135e4 Merge pull request #6728 from FlattestGuitar/click 
Adds clicks to flashlights 🔦
 2017-03-11 21:26:23 -05:00
uraniummeltdown 85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04:00
Crazy Lemon 661939c145 Merge pull request #6691 from davipatury/rcl 
Port's RCL from /vg/
 2017-03-11 15:30:48 -08:00
Fox McCloud 3c7d990061 Merge pull request #6710 from uraniummeltdown/coverflags 
Cleaned up clothing flags
 2017-03-11 04:57:15 -05:00
Fox McCloud d6da6e3f52 Merge pull request #6527 from davipatury/modular_computers 
Port's TG's modular computers
 2017-03-11 04:51:49 -05:00
uraniummeltdown 9eb7eea1e9 removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA 2017-03-10 22:46:02 +04:00
FlattestGuitar 8c9b1ab043 Adds clicks to flashlights 2017-03-10 17:21:09 +01:00
uraniummeltdown dd12fbe13a new flags_cover var for clothes, adjust existing flags 2017-03-10 11:33:42 +04:00
Fox McCloud 9510fa9f6c Merge pull request #6711 from Crazylemon64/playercreation_assembly_line 
Streamlines the ghost-to-player creation process
 2017-03-09 21:30:22 -05:00
davipatury 2a9bcde361 Fix conflicts. 2017-03-09 12:01:50 -03:00
Fox-McCloud 9e94f2ceeb Fixes Power Tools Materials and Recators Laser Scalpels 2017-03-09 02:08:42 -05:00
davipatury 781e66ec52 Fix conflicts. 2017-03-08 12:57:45 -03:00
davipatury 2ac164812c Fox's suggestions. 2017-03-08 12:04:19 -03:00
Crazylemon64 869c9b76c4 Streamlines the ghost-to-player creation process 
Also refactors ERT equipment to be actual outfits instead of hardcoded
 2017-03-08 05:49:49 -08:00
Markolie acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz 
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm
 2017-03-08 10:45:16 +01:00
Kyep dd767648d0 Fox requests 2017-03-07 22:33:04 -08:00
Fox McCloud f96c335d1f Merge pull request #6704 from uraniummeltdown/hardsuit 
Rename all "rigs" (hardsuits) to hardsuits
 2017-03-07 23:35:07 -05:00
Markolie 9594ec245b Change CE belt path to /full with tools 2017-03-07 18:16:30 +01:00
Markolie 2c23fbe34d Forgot to commit tools 2017-03-07 18:14:04 +01:00
uraniummeltdown dc6f9f5506 rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands 2017-03-07 20:55:43 +04:00
Markolie 3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00