Commit Graph
7 Commits
Author SHA1 Message Date
dfb85e6460 Preparing for the summer: baseball and dodgeballs! (#19627)
* welcome to the space jam

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* review suggestions

* conflict solve mistake

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/game/objects/items/sport.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* wear suit check

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-25 22:50:17 -06:00
cbdbf60f57 Makes the pet collar not an accessory. Remake remake of the revert of the revert. (#19644)
* let's try this again

* who even named these variables

* Sirryan review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* removes as mob

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-11-17 17:31:51 +00:00
KalevTaitandGitHub f028d4a9bf Code Readability - Objects (misc) (#18276)
* objects misc

* requested changes
2022-07-11 20:28:27 +01:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Sam 07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
monster860 3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Tigercat2000 595f24bd1b Cleanup /defines/ folder.
This commit removes code/defines/obj.dm and code/defines/obj/weapon.dm.
These files were only kept for legacy compatibility and do not fit into
the tree system at all. It doesn't even make sense since the base defines
are all that were in these, the actual code for the items was in the right
file.

Any new ports that use this file on a different codebase should be sorted
into the tree system anyways, new files if necessary. A giant defines
file is just wasting space and searching effort.
2015-05-09 16:06:59 -07:00