Commit Graph

2155 Commits

Author SHA1 Message Date
Aurorablade
f691e08deb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-03-25 23:15:37 -04:00
tigercat2000
b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC
# Conflicts:
#	code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00
tigercat2000
b1278de3d2 Merge pull request #8674 from uraniummeltdown/attacks
[READY] Attack Code Update
2018-03-22 11:55:53 -07:00
tigercat2000
5a756ad3c9 Merge pull request #8708 from Birdtalon/nanocalcium
Nanocalcium: Bone repair drug.
2018-03-19 13:37:20 -07:00
tigercat2000
6e9ee2e822 Revert ".357 nukie price fix" 2018-03-19 13:15:01 -07:00
tigercat2000
3a6cc2557e Merge pull request #8737 from shazbot194/357_price_fix
.357 nukie price fix
2018-03-19 13:14:32 -07:00
shazbot194
674176f0c3 Adds in a nukie only 357 2018-03-06 19:52:17 -09:00
uraniummeltdown
a2038d40b3 makes door code more OOP: reduced copypasta in shutter and poddoor code, they have their own icon files, changed name of icon_states in the maps
added a few defines and helpers
do_after family supports callbacks
added airlock security levels to airlocks
obj_integrity for doors, door assemblies, firelock frames
vault door assembly is 8 plasteel up from 6
explosion_block works better
heavy firelocks block explosions, firelock (de)construction uses crowbar instead of welder
xenos can open airlocks
minor change to attacking obj message
2018-03-04 13:52:55 +05:00
tigercat2000
087457fa9b Merge pull request #8675 from Serkket/001
Bug-B-Gone
2018-03-03 09:28:12 -08:00
Aurorablade
8562b345fd feedback changes..partly 2018-03-03 02:18:08 -05:00
tigercat2000
47cd4cb127 StonedMC
This commit ports the StonedMC from /tg/station, intended to replace the
Process Scheduler from goon. Currently, they exist simultaneously, as
it's very difficult to port our 22 processes to the SMC all at once.
Instead, we can make them work together until everything is converted
over at a later point, and then take the old PS out back and put a
couple of rounds into it's deformed skull.

Primary benefits of this new process controller include: Other people
that can actually maintain it, unlike the PS, pre-world-init
initialization for subsystems, ease of ports from /tg/station13, and
potential performance improvement (to be seen).
2018-03-02 21:12:49 -08:00
Aurorablade
d512c883de Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-02-24 22:45:26 -05:00
Birdtalon
fe914dc5f5 finishes effects, adds nanocalcium auto-injector, adds bone repair kit to uplink. adds sprites. 2018-02-21 20:44:03 +00:00
Fox McCloud
010d8d5eca Merge pull request #8651 from uraniummeltdown/titaniummineral
Titanium
2018-02-21 03:20:20 -05:00
tigercat2000
ff06bf8854 Merge pull request #8430 from Fox-McCloud/ied-buff
Buffs IEDs
2018-02-19 21:45:05 -08:00
Fox McCloud
1e1146cd21 changes 2018-02-20 00:33:22 -05:00
Aurorablade
8a8fb48a92 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-02-15 23:58:11 -05:00
Serket
00d501c7df BugBGone 2018-02-10 12:26:30 -07:00
uraniummeltdown
369c654c70 moves material defines to construction.dm
adds the titanium mineral, titanium [false]walls, titanium floors, titanium airlocks
adds plastitanium, plastitanium [false]walls, plastitanium floor
made survival pod wall a subtype of titanium wall
changes a few rnd recipes to use titanium
small refactor of ORM code, smelt titanium+plasma to plastitanium
shuttle windows have explosion block 3
2018-02-06 01:24:36 +05:00
Aurorablade
a0540814b0 THE VAR IS ROGUE
BLOW THE VARS
2018-02-02 01:55:31 -05:00
Aurorablade
061cbcfaf2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MOREDOTS 2018-02-02 01:26:12 -05:00
Aurorablade
cbc446a479 it works tiger pants 2018-02-02 00:31:19 -05:00
tigercat2000
ebe366fd67 Merge pull request #8403 from Aurorablade/FollowThePath
Ports some hud updates from TG
2018-02-01 19:56:51 -08:00
uraniummeltdown
134ad47f80 p_open -> panel_open 2018-01-23 18:10:57 +05:00
tigercat2000
696136b579 Merge pull request #8565 from uraniummeltdown/repathvisual
effect/temp_visual update
2018-01-20 11:25:08 -08:00
uraniummeltdown
6f20017153 spacing 2018-01-21 00:17:52 +05:00
tigercat2000
4830015bc4 Merge pull request #8550 from uraniummeltdown/tables
Table Construction Overhaul
2018-01-18 22:12:57 -08:00
uraniummeltdown
f1577b43f7 ethereal jaunt water effect won't show during wraith jaunt
removed unnecessary icon var settings
2018-01-18 22:25:34 +05:00
uraniummeltdown
c89b1e8463 repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2018-01-18 13:03:49 +05:00
uraniummeltdown
9c90c817b6 adds missing lavastaff and guardian phase effect icons
kills off anim() proc, removes ninja rigsuit electricity effect
gets rid of the flick() in temporary_visual.dm because pooling is dead
updates ethereal_jaunt.dm and makes it OOP, wraiths no longer show the wizard animation, jaunters cannot move after duration is over, fixes directions errors
turns many anim() into obj/effect/overlay/temp
smoother pet heart animation
2018-01-18 12:56:18 +05:00
Aurorablade
d2d53f929b removes stray processing 2018-01-16 19:42:53 -05:00
uraniummeltdown
8fd3a5e890 move cult effects to their own file
move cult beams to beam.dmi
2018-01-16 23:38:36 +05:00
uraniummeltdown
7f4c9263ce removes table parts, adds table frames
table/woodentable -> table/wood
tables are built by applying stacks to table frames
altered table construction
cleaned the code and increased obj_integrity of some tables and racks
lowercased 'carpet'
2018-01-12 23:22:55 +05:00
Aurorablade
a2601c0142 heh 2018-01-10 00:34:50 -05:00
Kyep
f13b15806a Refactor
- Deletes Paranormal & Janitor ERT outfits from /datum/outfit/admin (so
they won't show up in the main special outfit list as *static* outfits)
- Adds Paranormal & Janitor ERT outfits to 'emergency response team
member' sub-section of admin dress command, which means they're still
available, but now you can choose the level of them to equip to someone
(amber/red/gamma), instead of them always being the old static outfit
which doesn't match what real ERT actually use anymore.
- Refactors the way that spawning ERT cyborgs works, so that most of
their special stuff is done in New() instead of in response_team.dm.
This means that manually spawning an ERT cyborg will actually work,
rather than generating a half-ert cyborg with much of its special stuff
missing.
- Adds a new subtype of ERT cyborg, /mob/living/silicon/robot/ert/gamma,
which is absolutely identical to the normal ert borg, except that it
always has gamma module unlocked.  This enables admins to manually spawn
ERT gamma borgs, instead of all ERT borgs spawned always being non-gamma
ERT borgs.
2018-01-07 19:14:24 -08:00
Crazy Lemon
2da9316b4e Merge pull request #8226 from Anasari/GarroteBehindYouNuffinPersonnel
Nuke Op items discount & rebalance
2018-01-04 14:51:28 -08:00
tigercat2000
c1c4b08807 Merge pull request #8476 from uraniummeltdown/decon
deconstruct() at obj level + other changes
2018-01-02 10:28:17 -08:00
Alffd
bb6234c02e Marsmond and Shady changes 2017-12-31 13:35:37 -05:00
Alffd
376f93fe69 Status messages are also modified by colour replace lists. 2017-12-31 13:35:37 -05:00
Alffd
379b6621d3 There is no u in color 2017-12-31 13:35:37 -05:00
uraniummeltdown
75e177b7a9 renames receive_damage() for animations to receiving_damage()
renames take_damage() for organs to receive_damage()
renames Deconstruct() to deconstruct() for atmos objects
obj_integrity, max_integrity, integrity_failure vars moved to /obj level, obj_integrity = max_integrity on New()
2017-12-28 00:32:54 +05:00
Fox-McCloud
5f918ceb07 Buffs IEDs 2017-12-05 02:19:17 -05:00
Teri
d714396488 Lichfix
This fixes the bug with the Wizard, in which he sometimes spawns without hat and/or sandals and needs to pick up both afterwards from the ground.
2017-12-03 14:35:50 +00:00
Aurorablade
64c4883cc2 paths 2017-11-28 21:10:59 -05:00
tigercat2000
02615c4e43 Merge pull request #8388 from Fox-McCloud/slime-fix
Fixes Slime Transformation
2017-11-26 13:03:24 -08:00
tigercat2000
77810081e7 Merge pull request #8331 from uraniummeltdown/effectfiles
Splits effect_system.dm into multiple files and cleans it up, OOP particle effects and effect systems
2017-11-26 12:35:01 -08:00
tigercat2000
54c7c04500 Merge pull request #8347 from uraniummeltdown/reagentid
Add Reagent VV Update
2017-11-26 12:24:10 -08:00
Fox-McCloud
0e19a4d00c Fixes Slime Transformation 2017-11-20 12:11:59 -05:00
Aurorablade
070a9556bd Simplified 2017-11-18 00:17:16 -05:00
Aurorablade
26511031d1 0ver carbonated 2017-11-17 23:05:12 -05:00