Commit Graph

1448 Commits

Author SHA1 Message Date
Kluys
69e0eedead Managed to get a space in there somehow 2018-04-24 10:21:17 +02:00
Kluys
b36ccc592f Makes the code cleaner
dirty code is dirty, I hope this makes it better but obviously I am a newb so any input is welcome.
2018-04-23 12:12:01 +02:00
Kluys
fe758c21e7 Window placement revert
This commit reverts the window placement system, right now placing a one-dir window takes 2 prompts, this makes it so you just have to click a grille for it to place a one-dir window on the side you're facing.
Reverts a part of https://github.com/ParadiseSS13/Paradise/pull/8155
🆑 Kluys
Revert: Changes the window placement system back to the old system
/🆑
2018-04-22 22:50:34 +02:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud
6a02689398 Merge pull request #8726 from shazbot194/Major_Tom
Major tom
2018-04-14 23:58:19 -04:00
tigercat2000
639c40d140 Merge pull request #8824 from Fox-McCloud/gc-ss-port
Ports TG's Garbage Subsystem
2018-04-05 20:49:04 -07:00
shazbot194
234c8a78bc Merge conflict fix 2018-04-04 12:18:07 -08:00
uraniummeltdown
7f2f8363d8 separates alien structures and effects into own files
fixes aliens not being able to open egg
2018-04-04 23:18:12 +04:00
Fox McCloud
1d80bf01c0 Merge remote-tracking branch 'upstream/master' into gc-ss-port
# Conflicts:
#	paradise.dme
2018-04-03 18:21:04 -04:00
shazbot194
adcf2dcada Merge fix 2018-04-01 19:17:48 -08:00
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
Fox McCloud
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
MINIMAN10000
68ff13fe3a Add "One access" to non secure windoor #5973
Secure windoor has conditions for "One" and "All" access but default windoor only has "All" access. This adds "One" and "All" access to default windoor. Fixes #5973
2018-03-22 20:25:37 -07:00
tigercat2000
b1278de3d2 Merge pull request #8674 from uraniummeltdown/attacks
[READY] Attack Code Update
2018-03-22 11:55:53 -07:00
tigercat2000
50f9d695a5 Merge pull request #8124 from Aurorablade/Dreams
Byond the wall of sleep
2018-03-19 13:42:00 -07:00
tigercat2000
c4d4c3e23a Merge pull request #8733 from PigeonLord/nabber
Added Medical Marijuana Packets for the Psychologist
2018-03-13 04:58:04 -07:00
Piccione
81f12bf186 Added a Tape Recorder and a box of tapes to the Detective's Locker 2018-03-10 22:13:06 +01:00
Piccione
3bcc12bd94 Added Weed Packets 2018-03-06 22:22:10 +01:00
shazbot194
5573a9b36a small icon fix and Tiger's fixes 2018-03-04 18:32:50 -09:00
uraniummeltdown
b09e3ae6f6 spacing, src/loc consistency in playsound, reverted the weapon hitsound change, removed silicon/damage_procs.dm as it's unrelated and wasn't even included in the .dme, fixed some typos 2018-03-05 02:07:31 +05:00
shazbot194
b4bba77b45 Small update
mostly fixing spelling and minor things like that
2018-03-04 11:11:08 -09:00
shazbot194
04294839a0 Adds in the random spawner and makes the two suits on the telicom satellite random 2018-03-04 01:26:50 -09:00
uraniummeltdown
4c29377f86 addresses minor issues:
isobj changed to explicit istype /obj
added extra frames to blast door animation so it doesn't restart
removed ZAS vars from /door/, added missing vars to door subtypes
adjusted layers of doors, removed layer varedits on maps
2018-03-04 13:52:56 +05: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
uraniummeltdown
8f26d5b8b6 rename __DEFINES/mob.dm to __DEFINES/mobs.dm
make environment_smash into bitflags
add obj_damage for simple animals
make default max_integrity and obj_integrity INFINITY for non-defined objects, until we can move more objects to obj_integrity/take_damage() system
adds examining objects to roughly check damage
more obj_defense.dm procs
tables can be attacked with items, glass tables have a narsie_act()
fixes, changes to make it compile
2018-03-04 13:52:55 +05:00
uraniummeltdown
946ae0d58d moves var/list/armor to /obj level
adds armor to many objects
re-adds the clockcult floor sprite (accidentally removed in another PR)
adds clockcult effects to the clockcult floor
adds clockcult grilles
adds var/broken to /obj/structure
adds unused resistance_flags var
moves burn_state and resistance_flags to flags.dm
more updates to attack code
updated obj_defense.dm procs
2018-03-04 13:52:54 +05:00
uraniummeltdown
b76f8d2c35 new attack procs
minor fixes to make it compile
cleans up the code
2018-03-04 13:52:54 +05:00
shazbot194
9d4f88cf1d Replaces 'NASA Void suit' with 'Retro Suits'
and way better sprites
2018-03-03 23:12:19 -09:00
tigercat2000
693e188362 Merge pull request #8583 from FalseIncarnate/coffee
Coffee Mugs and Vendor Change
2018-03-03 10:32:54 -08:00
Birdtalon
3787190fb4 changes for loop 2018-02-27 14:29:37 +00:00
Birdtalon
dd3c11a757 for loop 2018-02-23 22:28:29 +00:00
Birdtalon
904131be1e some more toys for psyche 2018-02-23 13:48:08 +00:00
Fox McCloud
010d8d5eca Merge pull request #8651 from uraniummeltdown/titaniummineral
Titanium
2018-02-21 03:20:20 -05:00
Aurorablade
20ddaccb9b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DisMemberments 2018-02-08 02:31:44 -05: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
shazbot194
e6cbce1eaa Makes it just the mini 2018-01-28 19:07:49 -09:00
shazbot194
980d452f1c Adds in the energy pistol 2018-01-27 14:33:28 -09:00
FalseIncarnate
96c615132a Adds departmental and head of staff mugs
Adds mugs for each department to the loadout.
- The service mug is available to all jobs

Adds mugs for heads of staff, found in their respective locker.
- CE, RD, CMO, HoS, HoP, Captain

Moved mugs to their own loadout category
2018-01-25 01:52:04 -05:00
uraniummeltdown
1b914dd3a3 minor edits and a fix 2018-01-24 22:44:11 +05:00
uraniummeltdown
4730376381 move door_assembly types to new door_assembly_types.dm
fixed some redundant varedits
made glass airlocks a subtype of their solid variant
examine door assembly to see name set with pen
2018-01-22 21:54:11 +05:00
uraniummeltdown
9312f1fb7d airlock assembly states have defines, removed redundant door layer defines
added abductor airlocks from /tg/
station2 airlocks have a solid version, added external maintenance airlocks
added airlocks to RCD
survival pod airlocks have a solid version
door assemblies have examine hints, give more feedback, use overlays, mineral assemblies can have glass installed, use deconstruct() proc
multi tile airlocks have a solid version
moved airlock-specific procs to airlock_types.dm
airlocks use overlays now
airlocks use deconstruct() proc
map edits done to ensure nothing changes
some old airlock icons kept in due to use as /door/unpowered by away missions
airlocks open faster, delays between frames of icon states halved
added isshade() and isconstruct() helpers
cult airlocks will show their overlay
fixes plasteel material amount
2018-01-22 20:27:34 +05:00
tigercat2000
696136b579 Merge pull request #8565 from uraniummeltdown/repathvisual
effect/temp_visual update
2018-01-20 11:25:08 -08:00
uraniummeltdown
900bfd5e3b adds ratvar_act() and adds ratvar_act()'s for a few things
adds brass, clockwork floor, brass tables and table frames
2018-01-18 18:28:41 +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
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
tigercat2000
c1c4b08807 Merge pull request #8476 from uraniummeltdown/decon
deconstruct() at obj level + other changes
2018-01-02 10:28:17 -08:00
uraniummeltdown
1c9b3ed159 removes useless alter_health() unused proc 2018-01-02 20:49:28 +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
uraniummeltdown
73d7af2675 moves var/can_deconstruct to obj level
moves proc/deconstruct() and proc/take_damage() to obj level, moves a few obj damage procs in with it to new obj_defense.dm
moves plastic flaps to new plasticflaps.dm
2017-12-26 18:16:42 +05:00