Commit Graph

85 Commits

Author SHA1 Message Date
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
variableundefined
ec7206e612 Merge pull request #15599 from SabreML/flyswatter-fix
Fixes the flyswatter not swatting flies
2021-07-26 13:36:54 -04:00
SabreML
2c0ae9c500 Refactors the 'Examine' status tab (#16330)
* Removes the 'Examine' tab

* Revert "Removes the 'Examine' tab"

This reverts commit 0dd01722c9.

* Initial system and misc items

* Atmospherics

* Engineering

* Medical

* Mobs

* Stacks

* Structures

* Turfs & Weapons

* Final stuff and bad documentation

* Sheer laziness
2021-07-26 18:11:57 +01:00
SabreML
b45ee602bd Merge remote-tracking branch 'upstream/master' into flyswatter-fix 2021-06-21 21:03:30 +01:00
SabreML
0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
SabreML
48b1ecac2c Merge remote-tracking branch 'upstream/master' into flyswatter-fix
To trigger the RUSTG CI
2021-04-29 15:23:55 +01:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
f65c8994ce Broad TG Sound Update (#15608)
* Broad TG Sound Update

* jester update
2021-02-27 11:59:33 +00:00
SabreML
6a100c4889 Swatting 2021-02-23 22:31:58 +00:00
Fox McCloud
02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483)
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
2021-02-21 21:25:19 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
SabreML
a38c59aab2 Rapier Sheath quick-equip and sound effects (#15109)
* Rapier Sounds

* Regular click rather than alt-click
2020-12-16 14:40:26 -05:00
Ryal
37225485c9 Actually prevents swarmers from eating high-value targets (#14923)
* Prevents swarmers from eating high value targets

* Changes fluff
2020-11-19 09:25:21 +00:00
mochi
4055d58ff4 Fix esword children (cutlass) not using right icon 2020-06-09 14:29:03 +02:00
Fox McCloud
70b46d8aea Life refactor (#13471)
* Life Refactor WIP

* part 2

* part 3

* runtime fix

* newlines

* tweaks

* perspective checks

* fixes

* remote view tweaks

* more fixes

* robot fixes

* better updating

* cleaned up icon procs

* less proc call overhead

* performance gains

* more optimization

* shorter lists, removal of unecesary code

* gene OOP and dna styling cleanup

* oops

* axe disabilities

* typeless loop

* various tweaks and fixes

* brain checks

* runtime fixes

* cryo vision fixes
2020-06-03 19:43:30 -06:00
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
joep van der velden
5ca4ea4025 Removed unneeded New procs 2020-02-07 20:38:09 +01:00
joep van der velden
fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
Fox McCloud
20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -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
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud
1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
variableundefined
69537dd60c Port TG hitby refactor and detonation of items by projectiles 2019-09-09 22:57:31 -04:00
Mark van Alphen
c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
Mark van Alphen
f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
2019-04-10 21:54:54 +02:00
Fox McCloud
03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc
# Conflicts:
#	code/game/objects/items.dm
2019-04-07 19:54:14 -04:00
Mark van Alphen
391d91132c Fix code review issues (planetary_atmos and Initialize()) 2019-04-04 23:23:30 +02:00
CornMyCob
e02087d474 blood drunk miner 2019-04-04 20:34:26 +01:00
Mark van Alphen
ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Fox McCloud
814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
Fox McCloud
4969a03e94 Fixes and Updates CQC 2018-11-24 00:31:23 -05:00
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown
e6ded64e4a adds /mob/living/proc/attacked_by()
updates attack and defense code
adds missing sounds to some items, code cleanup, lowered volume for some sounds (from /tg/)
hitsound and attack_verb updates, weapons given hitsound on New() according to damage type
2018-03-04 13:52:52 +05:00
Tayyyyyyy
eb19ebab4f Refactor to use light_power 2018-01-24 13:43:31 -06:00
Tayyyyyyy
35ef33dab4 Refactor per Fox recommendation 2018-01-22 15:52:35 -06:00
Tayyyyyyy
93693cb197 Add light to energy sabers 2018-01-22 12:16:59 -06:00
uraniummeltdown
7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
Fox-McCloud
354cc6a987 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-04 17:17:09 -04:00
Fox-McCloud
549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Fox-McCloud
e1cc7e1431 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-01 20:17:16 -04:00
Fox-McCloud
05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
Fox-McCloud
04b9394d34 last tweaks 2017-07-01 01:44:02 -04:00
Fox-McCloud
e8bbe783c6 arm augments 2017-06-28 17:01:34 -04:00
Fox-McCloud
673f18f3e7 tweaks 2017-06-05 17:14:04 -04:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00