cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-18 21:42:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,918 Commits 27 Branches 2 Tags
bbdf2fb05a7dc25cdaa0358c78ad3222c2e1dc87
Commit Graph

3809 Commits

Author SHA1 Message Date
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
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
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
Fox McCloud
dfa46a3181 Merge pull request #6686 from MarsM0nd/Bags 
Small backpack sprite fix
 2017-03-05 02:57:21 -05: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 Lemon
0d5d8e6cbe Merge pull request #6597 from davipatury/wires-ui 
Wires Nano-UI-ification
 2017-03-04 10:21:19 -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 Lemon
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 McCloud
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 McCloud
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
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
KasparoVy
9dad350329 Desnowflakes the Special Reagent Handling & Amends+Completes Autoextinguish & Fixes Plasmaman Immolation Immunity Bug 
- Moved Vox and Plasmamen special reagent handling to the Species datum
to avoid snowflaking in reagent code
- Removed the AUTOEXTINGUISH flag and turned it into a var to conserve
flags
- Adds Plasmaman EVA suit auto-extinguisher reloading. Eject the
depleted cartridges with an action button and fill them as you would a
fire extinguisher, then just slot them back into the suit.
- Fixes a bug where having NOBREATHE cured a Plasmaman of burning when
exposed to atmosphere.
- Fixes a bug where Plasmamen would burn in space or in totally-Plasma
environments. Inspired by /vg/station.
 2017-02-22 00:12:01 -05:00
Markolie
3d86a56471 Fix recharge station overstacking things, megaphones being usable by mute people and ranged guardian cooldown 2017-02-20 17:30:29 +01:00
uraniummeltdown
7628586ee6 adds mineral statues from TG, added statue recipes for minerals, breakdown sandstone->sand 2017-02-19 21:48:13 +04:00
Tigercat2000
e7023fd032 Refactored 'select equipment' to use outfit datums 
Also moved outfit datum files to code/datum/outfits/, because I had
nowhere better to put all of the admin equipment- job stuff is still
with jobs
 2017-02-17 16:17:59 -08:00
Krausus
4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Crazy Lemon
35653d0cee Merge pull request #6380 from uraniummeltdown/tanksprites 
New Tank Sprites
 2017-02-14 21:32:53 -08:00
Crazy Lemon
2e6f341f70 Merge pull request #6388 from DrunkDwarf/rcd-airlock-name2 
Allows the Rapid Construction Device to set the name of a constructed Airlock
 2017-02-14 13:34:21 -08:00
Markolie
078ca5dd92 Fix examine 2017-02-13 19:30:22 +01:00
Markolie
5c177320c3 Fix remaining welding tool inhands 2017-02-13 19:26:18 +01:00
Markolie
e3eac9cdc7 Fix KA reskin mods and welding tool inhand 2017-02-13 19:12:26 +01:00
uraniummeltdown
c4dd6f533f Merge remote-tracking branch 'remotes/upstream/master' into tanksprites 
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
 2017-02-13 21:01:58 +04:00
Fox McCloud
39f5b5a5ef Merge pull request #6395 from uraniummeltdown/movetools 
Move tools into tools.dmi, RSF sprite
 2017-02-13 06:02:13 -05:00
uraniummeltdown
0e96552cf8 added back and belt sprites, double tanks use old belt sprites 2017-02-13 06:24:51 +04:00
Markolie
900653ea0e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-11 20:31:23 +01:00
uraniummeltdown
e03981aa02 formatting tools.dm 2017-02-11 15:47:25 +04:00
uraniummeltdown
1edc9a63e8 add rsf icon+inhand from /vg/, move crowbar,cutters,screwdriver,welders,wrench,rcd,rsf to tools.dmi 2017-02-11 15:46:38 +04:00
uraniummeltdown
1bdc663053 add inhand sprites for tanks 2017-02-11 13:06:54 +04:00
Fox McCloud
04f5276047 Merge pull request #6350 from Markolie/lavaland_updates 
Add remaining Lavaland loot, kinetic accelerator refactor
 2017-02-11 00:02:42 -05:00
Crazy Lemon
17281506d2 Merge pull request #6123 from KasparoVy/vulp-cblind 
Vulpkanin & Tajara mod. Colour Vision, Darksight to Eyes, Internal Mech(assist) Organ Icons
 2017-02-10 18:27:58 -08:00
Brian McGillivray
c087647cce Allows RCD to set constructed Airlocks name 
Adds a new section of the Airlock menu of the Rapid Construction Device
so as to allow the user to specify the name the newly constructed
Airlock should have.
 2017-02-10 18:57:04 +00:00
Markolie
b0d4f5d92a Various fixes 2017-02-10 18:55:23 +01:00
Markolie
c14b560ee0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-10 18:21:06 +01:00
Markolie
c93a592102 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	code/modules/shuttle/supply.dm
 2017-02-10 18:19:53 +01:00
Markolie
ed5ea305cc Add "Syndicate" prefix to Syndicate pAI card 2017-02-09 18:56:05 +01:00