Commit Graph

12 Commits

Author SHA1 Message Date
UselessTheremin
54464df533 Fancier Throws and Bullet Ejection (#12789)
* fixes that shit

* Revert "fixes that shit"

This reverts commit 8e6b495fa4.

* Update items.dm

* Update glass.dm

* Update drinks.dm

* Update drinks.dm

* Update bottle.dm

* Update inventory.dm

* Update _ammunition.dm

* Update reagent_containers.dm

* Update bottle.dm
2021-12-11 16:12:53 +00:00
adamsong
3baeaeb0c4 Steals tg's span macros (#12232)
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
2021-09-17 12:50:16 +01:00
Jamie D
10c9af0d77 Material datums - Moogle Helped - Check #10169 for more info (#10176)
* Hmm

* work please

* Fixes

* Ack

* REEE

* EEEE

* e

* e

* e

* STAND FIX

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-10-28 17:53:59 +00:00
alexkar598
fe934644ac Actually commits the line ending changes 2019-08-12 07:47:43 -04:00
4dplanner
8d1be69d22 Passes thrownthing to hitby (#41411)
* Passes thrownthing to hitby

* Items now also pass thrownthing

* No longer uses default arguments

Also fixes bananium shield

* Adds more arguments to hitby calls

* Standardises throw_impact

* Clears up some loose ends

* Adds back wacky comment

* Reinstates can_push=FALSE on bananium shield
2018-11-15 14:30:27 +01:00
Jordan Brown
495fceea1d Merge pull request #38982 from 81Denton/shuttle-loans
Adds a new shuttle loan event, tweaks others
2018-07-12 22:24:40 +01:00
Dax Dupont
eeb420005d You can no longer print infinite ammunition. (#37626)
* You can no longer print infinite ammunition.

* henk

lazy

anus

Reduces .38

Casings now give a tiny bit of metal so the janitor gets a buff

spacing
2018-05-03 14:44:58 +01:00
Jordan Brown
7abe962db0 Merge pull request #37549 from ShizCalev/bounce_away-fixes
Resolved var name conflict for bounce_away()
2018-04-30 18:54:04 +01:00
oranges
feca7a7b38 Uppercases slot defines. 2018-04-28 09:49:08 +01:00
iksyp
e3656a7619 Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful (#36670)
fix: makes dragnet non harmful
tweak: pacifists can now use any disabler or stun setting on any energy gun
code: removed all of the pacifism check code from code/modules/mob/living/living.dm
code: gun objects no longer have a harmful variable, instead, ammo_casing objects now have a harmful variable, which is by default set to TRUE
code: if a pacifist fires a gun, it checks whether or not the round chambered is lethal, instead of whether or not the gun itself is lethal.
2018-04-11 11:00:02 +01:00
kevinz000
3e4ffeab00 Fixes wormhole projectors (#36622) 2018-03-26 23:20:32 +01:00
kevinz000
f5ae06565c Splits up projectile files (#36018) 2018-03-04 17:10:46 -05:00