cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
7135 Commits
Author SHA1 Message Date
Fox McCloudandGitHub 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 LemonandGitHub 661939c145 Merge pull request #6691 from davipatury/rcl 
Port's RCL from /vg/
 2017-03-11 15:30:48 -08:00
Fox McCloudandGitHub 3c7d990061 Merge pull request #6710 from uraniummeltdown/coverflags 
Cleaned up clothing flags
 2017-03-11 04:57:15 -05:00
Fox McCloudandGitHub 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 McCloudandGitHub 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
Mark van AlphenandGitHub cef5626f85 Merge branch 'master' into findnreplace 2017-03-09 17:32:42 +01: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
Mark van AlphenandGitHub b26d50d9f9 Merge branch 'master' into findnreplace 2017-03-08 10:37:10 +01:00
Kyep dd767648d0 Fox requests 2017-03-07 22:33:04 -08:00
Fox McCloudandGitHub 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
Markolie 3b73053bc4 Tool fixes 2017-03-06 20:46:24 +01:00
Markolie 2c8ca5079f Comments 2017-03-06 13:07:13 +01:00
Fox-McCloud 41d4c83f17 Refactors Money 2017-03-06 04:52:03 -05:00
Markolie 5989862d37 Fix space 2017-03-05 23:30:41 +01:00
Markolie 9ec1400ae1 Fix comments 2017-03-05 23:04:41 +01:00
Markolie 9d9e957df1 Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold 2017-03-05 19:53:20 +01:00
davipatury a913797bf1 RCL 2017-03-05 13:22:55 -03:00
Mark van AlphenandGitHub b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00:00
Fox McCloudandGitHub dfa46a3181 Merge pull request #6686 from MarsM0nd/Bags 
Small backpack sprite fix
 2017-03-05 02:57:21 -05:00
davipatury af6db09309 Merge remote-tracking branch 'origin/master' into modular_computers 2017-03-04 15:44:20 -03:00
Mars 52b15a8f35 Small sprite fix 
Gives the grey satchel the grey satchel sprite instead of the leather
one.
 2017-03-04 19:36:30 +01:00
Crazy LemonandGitHub 0d5d8e6cbe Merge pull request #6597 from davipatury/wires-ui 
Wires Nano-UI-ification
 2017-03-04 10:21:19 -08:00
Kyep 3a44f7272e Nerfs Validhunting Chaplains 
Changes:
- Nerfs nullrod damage from 18 to 14, spellblade/carpblade from 15 to
12. Nullrod keeps is many forms and abilities, but now you have to
choose between a weapon with holy effects, and really good damage. You
no longer get both.
- Chaplain no longer get crusader armor (roundstart riot armor!) in
their locker. Roundstart riot armor is rather silly, especially for
someone in the service department.

🆑 Kyep
tweak: Chaplains no longer get roundstart riot-grade armor. In addition,
their nullrods do less damage.
/🆑
 2017-02-28 22:34:10 -08:00
uraniummeltdown 0c7ec9d330 Merge remote-tracking branch 'remotes/upstream/master' into statues 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-27 14:27:24 +04:00
Crazy LemonandGitHub 186edb14e7 Merge pull request #6468 from tigercat2000/job_refactor_tg 
Ported /tg/'s outfit datums, refactored job controller to support them
 2017-02-25 17:54:01 -08:00
davipatury a3a1775696 Wires nano-ui. 2017-02-25 21:51:28 -03:00
Fox McCloudandGitHub 1e44336a3a Merge pull request #6555 from KasparoVy/vox-plasmaman-reagent-bsns 
Reagent Oxygen is Toxic to Vox, Reagent Plasma Heals Plasmamen, Plasmaman Suit Autoextinguish & Plasmaman Exposure Burn Fixes
 2017-02-25 17:11:08 -05:00
Tigercat2000 fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08:00
Fox McCloudandGitHub 1044b2b84d Merge pull request #6515 from Crazylemon64/fast_servermonitor 
Telecomms monitor is speedier now
 2017-02-24 23:25:47 -05:00
Crazylemon64 2f8feff402 Refactors tcomms stuff a little 2017-02-24 18:10:08 -08:00
KasparoVy 3c24f6e255 Dumbs Down Plasmaman Suit Reloading & Amends Plasmaman Suitless Ignition 
Plasmaman suits no longer have an in-depth system by which their
autoextinguisher can be replenished, but a simple one.

Plasmamen now combust in the same circumstances regular gasous plasma
will as defined in LINDA code.
 2017-02-24 02:37:20 -05:00
KasparoVy 4bb1c57d7e Conflict resolution 
Unironically conflicting with another one of my PRs
 2017-02-23 17:26:22 -05:00
Markolie 58ae83724c Damn it, web editor 2017-02-22 20:15:27 +01:00
Mark van AlphenandGitHub ef446d2391 Fix indent 2017-02-22 18:38:06 +01:00
Markolie c5b897a951 Fix fax machine logout issue, fix card eject telekinesis interaction, fix death alarm follow link, fix flavor text not hiding when unknown, fix spacepod mining lasers 2017-02-22 18:24:43 +01:00
uraniummeltdown fd3e7add93 Merge remote-tracking branch 'remotes/upstream/master' into statues 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-22 19:57:04 +04:00
Mark van AlphenandGitHub 8396863d7f Merge branch 'master' into findnreplace 2017-02-22 16:39:53 +01:00