Commit Graph

44 Commits

Author SHA1 Message Date
AffectedArc07 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Fox McCloud 5170f3fbae the-strength-of-this-world-fades 2019-10-04 19:34:08 -04:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
Fox McCloud cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
joep van der velden f903290e1c better way 2019-03-24 07:59:39 +01:00
farie82 c05103c3f2 comments be gone 2019-03-23 15:18:00 +01:00
joep van der velden f4168349e2 correct inflatable deflate items 2019-03-23 15:16:59 +01:00
joep van der velden d04254a668 fixes more 2019-03-23 15:10:58 +01:00
joep van der velden 8b0334209d fixes the inflatable bug as well 2019-03-23 14:44:37 +01: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 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04: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
Fox-McCloud 0daf8a6a7f Object Embedding 2017-06-05 16:37:21 -04:00
Sam 07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Mark van Alphen 06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01: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
Markolie 6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
monster860 19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
Fox McCloud 7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins
Crazypilot's Space Ruins Port
2016-07-15 22:55:51 -04:00
monster860 009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
monster860 3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Crazylemon64 a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
2016-07-08 00:16:28 -07:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Crazylemon64 2c4d8e9b6a You can now load the cyberiad runtime-free 2016-07-03 15:36:38 -07:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Jey 189ac6f4e6 -small change 2016-01-15 14:10:47 -05:00
Jey 6002ec00e1 simple quality of life tweak to the inflatable walls / doors.
Alt-click on an inflated one to deflate (same as the deflate option on right click)
2016-01-15 13:19:18 -05:00
Certh 522a7b7ac5 bugfix: inflatable doors no longer disappear when deflating non-violently 2015-12-08 16:45:27 +01:00
Markolie 699bbd0972 Compile 2015-09-28 07:46:30 +02:00
Markolie 3397ddf7c1 Fix inflatable walls 2015-09-28 07:41:24 +02:00
Fox-McCloud 0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud a9f3eab669 pass 2+fix 2015-07-07 00:58:34 -04:00
Tigercat2000 7c9139d6e0 Bay/-tg- Meteor port
Meteors now have different types, properly integrated.
Meteoract has been removed, meteors now just call ex_act.
2015-06-21 18:39:39 -07:00
ZomgPonies e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
Tigercat2000 4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie 64fe9e8600 Remove legacy viewpoint code, move back to Bay's and /tg/'s system 2015-02-10 17:02:27 +01:00
Markolie b4db3ca710 Inflatable wall box change 2014-12-14 01:02:51 +01:00
Kelenius c54b9e3626 Slime update
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/say.dm
	code/modules/mob/transform_procs.dm
	code/modules/reagents/Chemistry-Recipes.dm
	maps/tgstation2.dmm
2014-07-15 00:50:41 -04:00
mwerezak 4a2993b20b Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
RavingManiac 9bfd6f56ba Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts.
Conflicts:
	maps/tgstation2.dmm
2014-04-28 18:47:15 -04:00
RavingManiac f80d1e702b Missing files added. 2014-04-19 15:51:27 -04:00