Henri215 and GitHub
ec90b441ad
Moves weapons sprites out of items.dmi ( #24634 )
...
* Moves weapons sprites out of items.dmi
* lets revert this
* oversight from energy melee PR
2024-03-19 17:08:35 +00:00
36b202bd26
Standardize on exclaiming about committing suicide. ( #24433 )
...
* Standardize on exclaiming about committing suicide.
* Update code/game/objects/items/weapons/kitchen.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* I think this is the last of the unexciting suicides.
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-03-10 18:18:36 +00:00
PopGamer46 and GitHub
939c09431e
IPC ghetto oversight fix ( #23794 )
2024-01-21 21:30:24 +00:00
db578cdc6f
Makes food not a subtype of reagent holders ( #23379 )
...
* I am suffering
* Alright this should be all now
* Fixes CI
* I hate the online merge resolver.
* This got lost in the merge master
* Updatepaths fixed + new added
* Contra review
* Fixes desserts
* Oops
* This should fix it
* Maybe?
* Attempt 3
* Missed conflict
* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update code/modules/food_and_drinks/food/foods/pizza.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Fixes grinders
* Adds comment
* Warrior review
* Warrior + Sirryan review
* Update code/modules/food_and_drinks/food_base.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-01-21 19:00:02 +00:00
2b9ca38824
Bug fix for carrot shivs Fixes #22556 ( #22627 )
...
* carrot_progress
* more carrot testing
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* Bugfix for #22556
* Bug fix regarding carrot shivs (#22556 )
* Update code/modules/hydroponics/grown/root.dm
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
* testing item.dmi fix
* hopeful items.dmi fix
* Update code/modules/hydroponics/grown/root.dm
Adds Contrabang's suggested parens.
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: ZERO-XZB <temp@temp.com >
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-03 17:40:02 +01:00
4c976a6e01
Splits up item_inhands.dmi ( #22584 )
...
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
* Fixes jackhammer and glass shard
* Fixes toy Chainsaw
* Update code/game/objects/items/toys.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/weaponry.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Fixes edagger hopefully
* Henri review
* Oops
* First this gone, and now the pain
* Should all be fixed now
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-10-01 11:47:25 +01:00
e09be2b54e
You got a fuckin' problem mate? Adds the glass shiv (attempt 2) ( #22416 )
...
* Redoes the Shiv PR, adds shiv (ready to go)
* Update code/modules/crafting/recipes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/crafting/recipes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update kitchen.dm
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2023-09-19 22:47:53 +01:00
DGamerL and GitHub
173bfb92f5
Removes bio resist from the code ( #21108 )
...
* BIO armor is kill
* some more stuff that uses bio resist
* I did a scuffed merge conflict solve but it works
2023-06-03 09:50:22 +01:00
Henri215 and GitHub
6826d2ba7b
Moving some in hand icons to different files ( #20748 )
...
* Moving some icons out of left/righthand.dmi
* Moving sheets and ores
2023-04-25 21:13:02 +02:00
Henri215 and GitHub
5fc267c58d
Adds in hand sprites for plastic fork, pspoon, pspork, pknife and spork ( #19082 )
...
* adds in hand sprites for pfork/pspoon/pspork
* added in hand sprite for plastic knife
* forgot to add left hand for spork,spoon and fork
* no idea how that sprite got removed
* fix spork icon and add right hand
* left hand for spork
* ??
* fixing conflict mistakes
* test
* ..
* left hand fix
* fix of the fix
2022-10-01 00:18:09 -05:00
6a91840962
Code Readability - Weapons ( #18171 )
...
* weapons
* weapons
* prefer explicit time
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
* Don't have code on same line as control statement
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
2022-07-10 13:59:33 +01:00
3b7e9fee93
refactors butchering of humans with chainsaw/meatcleaver ( #16812 )
...
* traits
* examine
* I am incapable of writing
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* people
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2021-11-05 09:11:10 +01:00
Mieszko Jedrzejczak
559fa37756
add defines for damage flags
2021-08-20 21:09:21 +02:00
SabreML and GitHub
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
Fox McCloud and GitHub
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
SteelSlayer
d928635393
Some spawn removals and other assorted code cleanup
2020-08-07 08:55:34 -05:00
AffectedArc07 and GitHub
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
fd913498bf
Make every obj/.../New() call it's parents
2020-01-29 10:43:32 +01:00
Fox McCloud and variableundefined
5194094d3a
Refactors Zone Selection ( #12523 )
2019-10-08 21:11:09 -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
AzuleUtama and variableundefined
da0375028f
Fixes incorrect description for Traitor's Meat Cleaver ( #12397 )
2019-09-23 15:25:53 -07:00
Fox McCloud
f998cb74ad
then-we-shall-reforge-the-armor-from-what-remains
2019-09-10 07:03:05 -04:00
Fox McCloud
e05e85618f
nah, needs a refactor
2019-08-19 20:15:29 -04:00
Fox McCloud
3667557b60
More Lavaland Updates: Primal and Bayonets
2019-08-19 20:02:53 -04:00
Mark van Alphen
c878f8e36e
Lavaland code review fixes - also integrates flyswatter and cat toy
2019-04-20 00:24:58 +02:00
f75de97c6e
Port over Corn and affected's work on Lavaland
...
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com >
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com >
2019-04-01 23:41:32 +02: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
UmeFuu and GitHub
5db7dafc38
Adds new circular cutter
...
Needed for the new cookies recipe and maybe future recipes
-----
Fixed, it didn't work before for some reason
2019-02-13 00:16:17 -03:00
UmeFuu and GitHub
ca2fa7c3b3
Adds new circular cutter
...
Needed for the new cookies recipe and maybe future recipes
2019-02-12 20:26:12 -03:00
Mitchell
242ef496cf
Removed extra comma.
2018-12-07 16:24:54 -06:00
Mitchell
54c4325c46
Adds Sushi Mat and Sushi Makiroll
...
Makes sushi 100% more efficient and viable to make a restaurant out of.
2018-12-07 13:28:10 -06:00
Tayyyyyyy
919bd7aaf2
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
Fox McCloud
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
IK3I
f94f77fc50
The Utensil of the future!
2018-01-23 18:45:55 -06: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
Sam
4d57fff5c9
Updates Intents
2017-06-10 09:43:36 +01:00
tigercat2000
633c972f46
RnD autolathe removal + tech level overhaul
2017-06-01 11:34:29 -07:00
Sam
07e0f768d6
Using Weight Defines
2017-05-27 16:34:49 +01:00
Fox-McCloud
706347fd84
even more work
2017-01-22 08:11:31 -05: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
Tigercat2000
71e5344a98
Mass replace
2016-07-07 19:34:02 -07:00
Tastyfish
7d259d35c7
Ports SNPCs
2016-04-09 00:10:01 -04:00
VampyrBytes
1148bde3a6
eating refactor ( #3733 ) + bugfixes
...
Ok, messed up resolving the merge conflicts (first try), so doing a
fresh pr. This turned out to be a good thing, as after I put the changes
back I tested again, and found 2 bugs (not due to my code)
Firstly, the organ refactor had introduced a bug when taking liver
damage from being drunk. It wasn't getting the liver correctly, leaving
it with null, and was then trying to damage it.
The second was related to the amount you took in when drinking
2016-03-05 08:03:39 +00:00
