variableundefined
a5c65002b5
Merge pull request #17100 from Adrer/Cabinet-doors-2-electric-boogaloo
...
Fix cabinet doors 2: Electric boogaloo
2021-11-14 15:37:04 -06:00
variableundefined
2c5c495cd1
Merge pull request #17064 from Vi3trice/heres-johnny
...
Rework the fireaxe cabinet so it uses less sprites, and other tweaks
2021-11-14 15:32:41 -06:00
Charlie
634f9c72f1
Vampire Rework. ( #16476 )
...
* vampire rework
* fixes and tweaks
* cleanup + tweaks
* grug stomp
* TGUI
* TGUI rebuild
* UID fix
* debugging cooldown fix
* first review changes
* subclass refactor
* tweaks + some sprites
* blackbox logging
* tweaks + grammar
* minor UI tweaks
* ability icon sprites.
* placeholder sprite warning fix
* melee mod code comment warning
* nullification rework
* final sprites!
* fixes
* sabre review pt 1
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
* sabre review pt2
* sprites readd
* tgui rebuild
* removes traitor vampires
* fixes
* readds sprites
* runtime fixes
* hotfix
* more runtime fixes
* glare tweak. less confusing when the vampire is stunned.
* gargantua nerf
* minor tweaks.
* hemomancer nerfs
* bugfixes and cleanup
* I did a dumb
* couple of fixes
* confusion and shadow snare fixes
* hemomancer nerfs part 2 electric boogaloo
* TGUI rebuild
* fixes and easier events
* Umbrae tweaks
* gargantua tweak
* umbrae nerf 2 electric boogaloo. also var edit suggestion
* runtime fix
* buffs blood nutrition to be in line with its metabolic rate
* Henk stuff
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* more review changes
* final tweak
* affected request + runtime fix
* FUCK
* fat fucks
* darkness tweaks
* UMBRAE AAAAAAAAAAAAAHH
* force doors bugfix
* either git or I am drunk
* admin rejuv fix
* I CANNOT SPELL
* shitnt code
* steel review
* tgui rebuild
* mochi review
* vampire ability usage logging
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2021-11-14 15:34:56 +01:00
adrermail@gmail.com
531bb709b6
Fix cabient doors 2
2021-11-14 14:09:31 +01:00
datlo
f92f20c74c
Fix cult structure stacking exploit ( #17091 )
2021-11-13 16:15:24 +01:00
Fox McCloud
8061afa550
Merge pull request #16172 from dearmochi/hair-gradients
...
[READY] Port hair gradient customization
2021-11-11 15:40:21 -05:00
Fox McCloud
06df88706f
Beginnings of Combat Changes: Ranged Weaponry ( #17075 )
2021-11-11 21:24:02 +01:00
Vi3trice
1a99534125
Oh fireaxe closet why you so bloated
2021-11-08 19:37:53 -05:00
variableundefined
9f2f9ac45e
Merge pull request #17038 from E-MonaRhg/carpet-stuff-two
...
The Subsequent Carpet PR: tweaks and tables edition
2021-11-07 10:24:47 -06:00
Cocacolagua
2d8f2f75bc
Wall-locker fixes ( #17051 )
...
* fixes wall lockers
* removes invisible locker
2021-11-07 09:02:56 +01:00
S34N
44c12c6d9d
Fixes open crate sprites ( #17050 )
...
* fakin underscores
* more crates
* sneak this one in too
2021-11-06 21:42:47 +01:00
variableundefined
1739f411a2
Merge pull request #16823 from S34NW/3/4th-closet
...
3/4ths Sprite Project: Closets
2021-11-06 14:19:14 -05:00
SweetBlueSylveon
2fdcbf8551
Grey Plushie Get! ( #16991 )
...
* Adds a Grey Plushie
Adds a grey plushie to the game, putting it as a loadout option, and adding a new sprite.
* Adds water interaction
Adds a water_act to the plushie. The plushie will now changed to "grey_singed" when touching water.
Upon touching water the plushie will scream and go "AAAAAH!" which then puts all text and audio interactions onto a 300 cooldown.
The plushie can also be hugged to make it go "Ow..." if its icon is set to singed. This is on the same cooldown as vox screams.
* Minor fixes
Fixes minor syntax and redundancy problem in the code.
* Updated sprite
Adds new sprites for grey_plushie and grey_singed.
* Converts Cooldown and spawn system to timer.
Changes the cooldown and spawn system to a timer and callback system.
* Update code/game/objects/items/toys.dm
Adds early return.
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* Update code/game/objects/items/toys.dm
Simplifies code, corrects mistakes.
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* Complicated
-Splits the cooldown variable and proc into two, one for hugging one for screaming.
-Adds more BOOLEAN
-Properly implements Timer and Callback system.
-Adds early returns.
* Revert "Complicated"
reverts dme changes.
* Adds an if statement
Adds an if statement so that the server is not setting the icon and description every time the plushie gets wet.
* Minor correction
Fixes the order of the if statement and changes its type.
* Reverts test change
Last commit had testing changes I failed to revert before pushing.
* Changes the sprite.
-New, smaller icons.
-Slightly heavier shading.
(Can be undone and edited further, I still have the other sprites)
* Another sprite update
-I learned to use HSL.
* Small bugfix
Last code update I wrapped the screaming proc into the "don't set the icon and description if it's already singed" by accident. Swapping them around fixed it, and it will now be able to yell from water every 30 seconds again.
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2021-11-06 17:34:17 +01:00
E-MonaRhg
ac68ea59df
Carpet and table stuff
2021-11-05 19:46:42 +02:00
variableundefined
6102145ded
Merge pull request #16909 from S34NW/tg_plant_stuff
...
Ports better grass and jungle objects used in TG
2021-11-05 08:37:54 -05:00
datlo
d94210031b
Refactor C4, subtypes, and airlock ex_act ( #16995 )
...
* Refactor C4 and Airlock ex_act
* update uplink desc
* Replace ismob by carbon, clarify comment
* remove unnecessary ismob check
* replace destroy by qdel, fix comment
* auto doc comments, add else condition
* Add comment to shaped c4
* Shortens shaped boom proc, make airlocks more resistant against light ex
2021-11-05 10:12:09 +01:00
hal9000PR
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
SabreML
1c3c2c22ad
Name Capitalisation Tweaks (Weapons) ( #16906 )
...
* Weapon names
* Assault rile
* More #coding_chat tweaks
Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.
* Missed these
2021-11-04 19:47:31 +01:00
Fox McCloud
705768abd6
Merge pull request #17010 from S34NW/electrochromic_spawner_thingy
...
Passes ID var from window spawners to electrochromic windows
2021-11-04 14:09:34 -04:00
S34N
53d8fe677d
Update code/game/objects/effects/misc.dm
2021-11-04 17:50:44 +00:00
variableundefined
2684afc85b
Merge pull request #17027 from Sirryan2002/birdsarentreal
...
Fixes a spelling mistake in implanter.dm
2021-11-03 20:08:01 -05:00
S34NW
84a027b2be
crazylemon suggestion
2021-11-03 13:13:48 +00:00
Sirryan2002
6f405149f2
spell check
2021-11-03 02:02:18 -04:00
Luc
b527838507
Fix abductor closet cloning mats ( #16985 )
...
* Update abductor closet to only drop one alloy
* Revert, make it just cost two alloy to make
2021-11-02 22:07:46 -06:00
S34NW
991da9a09b
safeties
2021-11-01 22:33:34 +00:00
Fox McCloud
2cefacd9b0
Merge pull request #17019 from S34NW/trader_fix
...
Fixes keyless sol trader vehicles
2021-11-01 18:03:10 -04:00
S34NW
44d8d455bf
merge conflict part 2
2021-11-01 10:18:51 +00:00
S34NW
1723e0b503
Merge branch 'master' into 3/4th-closet
2021-11-01 10:14:41 +00:00
variableundefined
62d0df33ea
Merge pull request #16998 from lewcc/med-scanner-rads
...
Add radioactive message to health analyzer
2021-10-31 22:25:16 -05:00
variableundefined
c0e21aa64e
Merge pull request #16996 from hal9000PR/bnuuy
...
Adds Bunnies.
2021-10-31 22:24:31 -05:00
S34NW
816e478302
order of operations moment
2021-10-31 21:09:33 +00:00
S34NW
3d477b3427
leys you use id on spawners to pass them to windows
2021-10-29 20:44:11 +01:00
lewcc
bbf92a4d1a
to_char -> to_chat
2021-10-27 10:05:13 -04:00
mochi
c7046c0756
Merge branch 'master' into hair-gradients
2021-10-27 13:33:12 +02:00
lewcc
812b58acd7
Add note for user rad contamination
2021-10-27 01:40:41 -04:00
PacifistDalek
f486448a95
Food Cart Refactor ( #16869 )
...
* Food Cart Refactor
* delete unused old sprites
* No longer can be deconstructed or destroyed into smartfridge parts
2021-10-26 23:33:03 +01:00
Vi3trice
758908e5ff
CE closet has an RCD ( #16820 )
2021-10-26 23:32:38 +01:00
SabreML
945e00e497
IAA locker, spare headsets, and general locker cleanup ( #16440 )
...
* Locker + Bookcase tweaks
* HoS flask
2021-10-26 23:09:45 +01:00
hal9000PR
e5afa54965
Merge remote-tracking branch 'upstream/master' into bnuuy
2021-10-26 19:53:15 +01:00
hal9000PR
f095264807
bnuuy
2021-10-26 19:47:41 +01:00
matttheficus
fd3b0f9e05
this should do it ( #16971 )
2021-10-18 22:50:20 +01:00
SabreML
ab7e8f0f38
Fire extinguisher GC fix ( #16965 )
2021-10-18 17:12:54 +01:00
dearmochi
6e0006a145
Fixes fire axe wielded inhand sprite regression ( #16967 )
2021-10-18 16:16:11 +01:00
E-MonaRhg
f9c672ffa2
A lesson in testing your PRs ( #16969 )
2021-10-18 16:15:54 +01:00
variableundefined
066cd3be7b
Merge pull request #16932 from matttheficus/TrayQOL
...
Serving Tray Quality of Life - 8 Slots
2021-10-17 13:51:00 -05:00
variableundefined
edd1781e38
Merge pull request #16943 from E-MonaRhg/more-carpets
...
Carpet bomb your station: 8 more carpet types and a carpet cargo crate
2021-10-17 13:30:03 -05:00
SabreML
146351ae82
Cigarette overlay update ( #16936 )
2021-10-15 11:00:26 +01:00
E-MonaRhg
310616cdf3
Carpet bomb your local station
2021-10-14 20:23:11 +02:00
matttheficus
468ff53ac7
8 because i cant count
2021-10-13 17:27:38 -04:00
matttheficus
ee16debc62
oh god does this work
2021-10-13 17:22:53 -04:00
