Commit Graph

371 Commits

Author SHA1 Message Date
DGamerL
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
datlo
cf07639da3 Tweak kitchen spikes (#21152)
* Tweak kitchen spike

* fix deconstruction

* fix mistake lmao

* revert wrench_act and fix metal drop

* fix accidental removal

* and the damn end of line

* AAAA

* add mob check to victim, deconstructing tweak

* fix bug preventing attack on spikes
2023-06-02 19:12:02 +01:00
Englishformula
a5d5086819 Alien Alloy Sprite Fix (#21103)
* Update mineral.dm

* Update mineral.dm
2023-06-02 18:07:24 +01:00
Henri215
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
S34N
c8418fa1b2 sinew (#20718) 2023-03-26 13:59:53 +01:00
S34N
5ce5a66c81 Ports a load of Pigeonverde322 sprites from beestation (#20588)
* initial

* second

* MORE

* spelling

* more spelling, rods

* qwik mafs
2023-03-26 12:11:01 +01:00
GDN
5557f6ae32 Nukes detailed examine (#20314)
* Nukes detailed examine, converts to normal examine stuff

* THE SHOOTENING

* Update code/game/objects/structures/grille.dm

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* oop

* Update code/modules/mob/living/silicon/robot/drone/maint_drone.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/power/apc/apc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/projectiles/guns/energy/nuclear.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* bam

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-03-17 16:20:53 -05:00
Henri215
ad608cf016 Fix #20076 Plasmaglass and plasmarglass now returns the correct amount of materials (#20079)
* Plasmaglass and Plasmarglass now returns the correct amount of materials

* forgot alien alloy
2023-01-03 15:48:58 -05:00
Qwertytoforty
1c05e8aa5e Mining borgs now have melee armor. (#19986)
* Mining borgs now have melee armor.

* oh, and one more thing

* Apply suggestions from code review

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

* siryan code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2023-01-03 01:04:39 -05:00
warriorstar-orion
066bd06e8d Whitespace cleanup part 3. (#19897)
* Whitespace cleanup part 3.

* clean up mecha a lot, other review fixes
2022-12-27 11:00:39 -05:00
Henri215
ab8217f012 Mineral doors now takes 2 seconds to build (#19992) 2022-12-24 11:05:24 -05:00
Daylight
ebf2d2b18f Creates full stacks of all sheets and minerals (#19911)
* /fifty

* re-adds plastinium, even if the sheets themselves have no sprite

* adds glass stacks and plastitanium
2022-12-19 14:29:55 +00:00
Henri215
74a5925def A museum's finest: Statues tweaks (#19680)
* tweaks and adds to statues

* bust removed
2022-11-26 16:02:52 -05:00
S34N
4de47b8b58 Refactors table creation (#19441)
* refactors table creation

* probably works will test later

* tested and tweaked

* words are hard

* Apply suggestions from code review

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

* steel review

* proc breakout

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-15 15:45:55 -06:00
Henri215
eea6b82b15 Sarcophagus now can be made using sandstone (#19625)
* added sarcophagus to sandstone recipes

* 5 seconds to build
2022-11-11 14:31:58 +01:00
Henri215
499a0f3b9d Moved wood floor (#19487) 2022-10-25 20:35:28 +02:00
DevanStrife
bb2e2a9d45 Allows wooden airlocks to be made and removes another text2path function. (#19199)
* Fixes #18882 and refactors for door assemblies

* Removes text2path, makes wooden airlocks buildable

* Use mineral crafting menu

* Minor oversight

* Comments improvement

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Review suggestions

* Removes unneeded vars

* Fixed tab spacing

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-16 13:04:50 -05:00
Henri215
70762ba7e0 Adds briefcase/card box as leather recipes and reorganizes other recipes (#19342)
* adds briefcase and card box to leather and reorganizes recipes

* standardized the coded and removed unnecessary  \

* seconds
2022-10-16 13:47:33 +02:00
Vi3trice
9e90c81282 Defining Part 1 - Code cleanup toward defines (#19262)
* This is only the beginning

* Update stack.dm
2022-10-10 20:50:29 +02:00
Henri215
3d2092885f Bronze/Glass ashtray now can be made (#19056)
* ashtray crafting

* added timers
2022-09-17 10:51:02 +01:00
Henri215
7ff1418ae4 add cloth foot wrap recipe (#19052) 2022-09-16 18:36:51 +01:00
AffectedArc07
2da68e9b64 Atmospherics refactor (#18460)
* Atmospherics refactor

* META(GAMING)

* Cleanup

* RPD hotfix

* Fox review

* Do this

* Well that escalated

* Repath these

* Ah yes, scope creep

* Remove this comment

* Regression #1
2022-08-01 16:27:35 -04:00
Vi3trice
f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
dragonpan2
1dc0669e12 expanded plastic crafting (#18281) 2022-07-15 20:32:48 -05:00
S34N
10d0e2f230 New benches, colourable sofas (#17985)
* new benches, colourable sofas, directional beds

* removes bench corners

* slight sprite tweak

* inverse corners!

* removes rotatable beds due to mob jank and bedsheets

* fixes that one freaking always wrong cyberiad sofa

* make things use the in-built spraycan menu
2022-06-20 21:00:12 +01:00
Kugamo
d4d4615fe2 Inhand sprites for metal sheets and ores (#17952)
* amogus

* Revert "amogus"

This reverts commit ebaa99c77b.

* okay

* fix merge conflict
2022-06-14 13:34:08 +01:00
13spacemen
b2a57c7637 changed the green medbay airlocks to blue ones (#17827)
green ones are now a new subtype virology airlocks
added viro airlocks to RCD, metal recipes, airlock painter
2022-06-09 12:32:03 +01:00
Mitchs98
fa3997bb42 Adds Chess Pieces (#17587)
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2022-05-16 22:25:21 +09:00
Charlie
e979201a57 Removes tribbles (#17524)
* removes tribbles

* forgot this

* styling
2022-03-28 09:57:10 +01:00
datlo
f92f20c74c Fix cult structure stacking exploit (#17091) 2021-11-13 16:15:24 +01: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
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
Qwertytoforty
ce260375ff Finishing touches 2021-09-12 14:57:33 -04:00
Qwertytoforty
2f25c2100f Merge remote-tracking branch 'upstream/master' into thinking-with-cult-portals 2021-09-11 18:00:52 -04:00
variableundefined
b0c4dd605a Merge pull request #16606 from S34NW/we_live_in_an_electrochromic_society
Constructable electrochromic windows
2021-09-08 08:52:43 -05:00
Qwertytoforty
e9761d0e18 Draw 2 circles 2021-09-03 17:34:43 -04:00
variableundefined
7964ea23ca Merge pull request #16569 from S34NW/tg_object_sprites
[REQUIRES #16571] TG sprite project: item/obj (part 1)
2021-08-29 14:42:18 -05:00
S34NW
77737581c1 Fancy windows? I think so good sir! 2021-08-28 15:11:07 +01:00
S34NW
14004ce2f2 fax machines, chairs, pews, corpo sofa 2021-08-22 16:34:55 +01:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
shmabuu
61330ef44a i do be seeing part 2 2021-08-07 01:36:50 -07: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
variableundefined
b9aa1facce Merge pull request #15757 from warior4356/holy-chapel
Makes the chapel holy once more.
2021-07-25 08:37:18 -04:00
Fox McCloud
f5af21b794 Merge pull request #16213 from AffectedArc07/nukes-awful-code
Removes some oldcode
2021-07-07 09:57:16 -04:00
warior4356
15b32b7283 Merge branch 'master' into holy-chapel 2021-07-05 18:12:02 -07:00
LordShekelstein
3efc77a9e8 fixes spelling error. (#16308) 2021-07-05 18:27:53 +01:00
warior4356
aec95fed48 Merge branch 'master' into holy-chapel 2021-06-28 20:31:34 -07: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
AffectedArc07
aed6fed004 Removes some oldcode 2021-06-19 18:56:48 +01:00
Sirryan2002
98b97e02b0 Axes Ratvar_Act() from the code (#16025)
* Ratvar_Act() is no more

* fixes runtime with recipes

* readds removed brass objects

* Fixes an oopsie

* removes unnecesary procs
2021-06-04 10:49:12 +01:00