Commit Graph

1475 Commits

Author SHA1 Message Date
Fox McCloud 7f2f766f70 Merge remote-tracking branch 'upstream/master' into attack-hulk
# Conflicts:
#	code/game/objects/structures/window.dm
2018-06-03 18:49:44 -04:00
uraniummeltdown 75bded82cf added defines for window construction states and full window diagonal dir
added a proc to check for valid window location, added var/fulltile to windows instead of using a proc
added clockwork windoors and windows to brass recipes
added titanium glass and plastitanium glass, made glass types use recipes like other stacks, you can smelt the new glasses in the ORM
removed force from RCD and added NOBLUDGEON flag, fixing a bug where you couldn't deconstruct airlocks with an RCD
slight nerf to wielded fireaxe, does high damage to windows and grilles instead of insta-deleting them
deleted fullwindow.dm and moved windows to window.dm
added some feedback to placing glass on grilles
examining windoor assembly shows you can rotate it, examining windows show deconstruction hints and rotation
added cracks to windows, you can repair windows using a welding tool on help intent, slight buff to window health
added var/cancolor to windows and blacklists some windows from being auto-colored, window shards also get colored on narsie_act()
full windows now use icon smoothing system, windows now use the obj_integrity damage system
added is_glass_sheet() helper
2018-06-03 13:11:37 +04:00
Tayyyyyyy 919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy dd120a00f0 Their 2018-05-25 18:34:24 -07:00
Tayyyyyyy 170266d827 More pronouns 2018-05-25 18:34:23 -07:00
Fox McCloud fc7692cdce alien object damage system 2018-05-19 03:26:10 -04:00
Fox McCloud a87170255b Makes Hulk Attacking Less Snowflakey 2018-05-19 02:32:34 -04:00
Fox McCloud 224b18af1c Merge remote-tracking branch 'upstream/master' into attack-animation-improvements 2018-05-17 23:34:01 -04:00
tigercat2000 1cfc3f27c8 Merge pull request #8974 from Fox-McCloud/holo-projector
Ports Holoprojectors
2018-05-17 20:19:13 -07:00
Fox McCloud c0d5655f4d Further Improves Attack Animations 2018-05-17 19:48:03 -04:00
Fox McCloud b3524505b5 tweak 2018-05-14 17:51:13 -04:00
Fox McCloud 8845262d65 Merge remote-tracking branch 'upstream/master' into holo-projector
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	paradise.dme
2018-05-04 16:37:24 -04:00
tigercat2000 7fb8f8d76c Merge remote-tracking branch 'upstream/master' into more_ss_ports
# Conflicts:
#	paradise.dme
2018-04-30 09:27:11 -07:00
Fox McCloud b394cf3624 Ports Holoprojectors 2018-04-30 00:24:46 -04:00
tigercat2000 3c1fbf9cc5 Merge pull request #8938 from Fox-McCloud/guillotine
Ports Guillotine
2018-04-29 20:28:50 -07:00
Fox McCloud bc6f664b51 tweak 2018-04-29 22:58:18 -04:00
tigercat2000 44deafe987 Merge pull request #8907 from Bram961/Window-placement
Window placement revert
2018-04-29 19:40:32 -07:00
Fox McCloud 63e2a175fd Merge remote-tracking branch 'upstream/master' into timer-subsystem 2018-04-29 21:14:11 -04:00
Fox McCloud 4474757e14 edge case 2018-04-29 19:16:04 -04:00
tigercat2000 7d8c9a731a SS Conversion: Atoms, Machines, n' Mobs
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
Fox McCloud cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Fox McCloud 8f5f57dd0b adds clapping 2018-04-27 19:27:47 -04:00
Fox McCloud b238dfc581 Ports Guillotine 2018-04-27 18:58:23 -04:00
Fox McCloud 9266789511 stop this now 2018-04-26 19:51:22 -04:00
Fox McCloud cb423dfb1b Ports Looping Sounds 2018-04-26 19:18:24 -04:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
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
tigercat2000 c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08: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