Commit Graph

933 Commits

Author SHA1 Message Date
AzuleUtama 0f3133eb25 Fixes certain Nuke Ops bundles using the wrong duffelbag sprite (#17717)
* sprites updated

* removes redundant icon/item states
2022-05-03 04:24:16 +01:00
Nazsgull c3013b83ca Closes UI for all players looking into a storage inside a recently closed locker (#17519)
* Close UI for all players looking into a storage inside a locker

* Moves the check to objects/item/weapons/storage

Also removed the code from objects\structures\crates_lockers\closets.dm

* Keeps UI open for the mob itself, when they should

Also removed code from attack_hand that conflicted with forceMove. That behaviour is being handled from the forceMove instead of from attack_hand.
2022-04-22 11:42:58 +01:00
Kugamo 7189ae5d65 Janitor QOL (#17594)
* Yes

* No

suggested changes

* Maybe

Suggestions + water in cart sprites

* Merge Conflict Resolve

* Suggested Changes :o)

* fixes bugs

* suggested changes round 2
2022-04-22 11:39:21 +01:00
atteria bcf90593ed Improves belt item overlay code, Adds new belt item overlay sprites (#17568)
* belt-improvements-and-sprites

* fixes my fix of botany belt allowed contents
2022-04-12 15:57:21 +01:00
S34N 0ad8fac9c5 Checks contents of storage items for restrictions (#17236)
Co-authored-by: warriorstar-orion <59303604+warriorstar-orion@users.noreply.github.com>
2021-12-17 10:45:07 +01:00
Fox McCloud 06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01: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
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
variableundefined 066cd3be7b Merge pull request #16932 from matttheficus/TrayQOL
Serving Tray Quality of Life - 8 Slots
2021-10-17 13:51:00 -05: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
Mieszko Jędrzejczak 7c39eafafe midori-san (#16856) 2021-10-09 17:06:43 +01:00
AffectedArc07 129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
variableundefined 522390c0b9 Merge pull request #15675 from Fox-McCloud/his-grace-ascended
Implements Better His Grace
2021-09-18 15:26:30 -05:00
variableundefined fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
variableundefined c2664eec0d Merge pull request #16311 from S34NW/does-anyone-else-hate-genetics
Replaces genetics xray vision with other vision genes
2021-09-06 23:16:04 -05:00
Fox McCloud 23164e354b conflicts 2021-09-06 04:06:47 -04:00
variableundefined 188496c678 Merge pull request #16595 from SabreML/clothing-migration
[IDB IGNORE] Clothing .dmi file organisation
2021-09-01 19:44:59 -05:00
variableundefined d1ee992ba1 Merge pull request #16519 from Cocacolagua/head-bonk
Helmets no longer protect you from bible brain damage
2021-08-29 14:47:30 -05:00
SabreML 6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
S34NW e7e4e6beb6 new lights, dupe sprite removal, APC cell clarity 2021-08-20 12:52:39 +01:00
variableundefined 99e8487bfd Merge pull request #15656 from Qwertytoforty/I-guess-I-port-stuff-now-huh
Adds supermatter sliver steal and plutonium core steal objective from TG
2021-08-11 16:05:24 -04:00
Cocacolagua fa1554a21f no more helmet protection 2021-08-10 10:58:12 -03:00
S34NW fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +01:00
SabreML 02fe0876f5 Fix bundle #3 (#16411)
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-08-05 11:04:27 +01:00
Qwertytoforty 6f6d04f8f7 Merge remote-tracking branch 'upstream/master' into I-guess-I-port-stuff-now-huh 2021-07-23 10:35:54 -04:00
Sirryan2002 6b6b9a68da Jani ERT Equipment Tweak 2021-07-19 16:28:31 -04:00
S34NW 59938c00e5 Merge branch 'master' into solgov_ERT 2021-07-10 15:43:33 +01:00
SabreML 04c689817e Fire + Cloth = Bad things (#15635) 2021-07-08 22:57:08 +01:00
warior4356 b949b1adc2 Adds sec hailers and space pod keys to sec belt (#15977) 2021-07-08 22:31:06 +01:00
E-MonaRhg 8719801295 Bandolier stacks (#16106) 2021-07-08 22:22:59 +01:00
S34NW 705a013445 i do 2021-07-05 22:44:30 +01:00
Qwertytoforty 7413256cb8 Prevents ghosts from setting off mousetraps (#16274)
* Prevents ghosts from setting off mousetraps

* Update code/game/objects/items/weapons/storage/storage.dm

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

* Note to self: Do not be tired when commiting suggestions

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2021-07-02 16:20:12 +01:00
Qwertytoforty e4461eac09 Please don't break 2021-06-28 19:12:39 -04:00
S34N 7c6e19850a Merge branch 'master' into solgov_ERT 2021-06-22 10:37:32 +01: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
hal9000PR fc3185dcb6 fix (#16209) 2021-06-19 23:07:50 +01:00
S34NW ba45742fe9 loadout update, armour tweaks 2021-06-13 16:56:57 +01:00
SteelSlayer e4bbd94d6a Robot_module and cyborg stack refactor (#13527)
* robot_module refactor

* some fixes

1. adds medical stacks of 25 for the syndi medical borg
2. fixes various construction steps that weren't using `use()` or `get_amount()`

* review tweaks + other stuff

1. Makes a bunch of for loops into istypeless loops
2. Adds a readout of the current out of stacks a borg has, in the status panel
3. Slightly reorganizes the medical, syndi medical, engineering and syndi engineering cyborgs items

* fixes after upstream merge

* blank line for travis

* fixes and improvements

1. Fixed welder icon's not updating periodically if you were charging in a borg recharger
2. Fixes solar panels dropping /cyborg type glass when they were deconstructed.
3. Band-aid fix (incase #2 doesn't fix this) for cyborg stack's `source` var being null which resulted in tons of "cannot read null.energy" runtimes

* more fixes + constructable frame runtime fix

* removes toy sword placeholder

remove comment

* remove these as well

* .amount to .get_amount(), really should have done this before

* refactors robot_upgrades to work with the new system

- more cleanup
- adds documentation
- fixed a bug I made where you could delete your robot stack via crafting

* moves some unemag logic to the module file, makes more loops typless

* farie review

* fox review

* affected review and more TM bugfixes

* fixes comment

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2021-05-24 16:24:25 +01:00
Qwertytoforty 359b3f6aa4 Merge remote-tracking branch 'upstream/master' into I-guess-I-port-stuff-now-huh 2021-05-16 09:19:08 -04:00
S34N ae6f6148c2 Solgov tweaks (#15896)
* marines, solgov, and more!

* belts are belts

* forgot da hat

* swapped guns around, loadout hat no longer strong

* Update code/datums/outfits/outfit_admin.dm

* updated shading on uniforms

* yeets a null entry

* gas masks, flipped caps

* renamed gas masks

* merge conflicts

* dmi conflicts confuse me

* ARG mag update
2021-05-16 11:38:16 +01:00
ppi13 b97fedf863 Adds the Elusive Black crayon 2021-04-10 02:17:01 +02:00
Qwertytoforty 0789cfd3fe Updates to latest, so I can deconflict 2021-03-05 14:06:46 -05:00
Fox McCloud 118e73966f Implements Better His Grace 2021-03-05 13:51:17 -05:00
Fox McCloud 156d360e57 TG Sprite Update Project: Toolboxes (#15663) 2021-03-05 17:33:29 +00:00
Qwertytoforty 88d876d3dc the rest of the fucking owl. Adds nuke core objective, fixes 2021-03-04 13:55:05 -05:00
Fox McCloud 091146029a No, Mobs Are Not Lockboxes (#15657) 2021-03-03 22:05:54 +00:00
Qwertytoforty 506f980d3d Adds supermatter sliver steal objective from TG 2021-03-03 16:33:48 -05:00
SabreML 3ae6ef1fc2 Initialized Storage Items (#15057)
* Refactor V1

* And this too

Three commits already

* Review stuff

* hecking invisible runtimes

* Cleanup and Documentation

This part is NOT intended to be a refactor.
I just figured why not go through everything since I'm already messing with it.

* Hopefully got all of the . = ..()

Also fixed a massive bug that I somehow didn't notice.

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* for() loops

Pretty sure I got everything.
Cutoff point is 4 items.

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-02-28 21:45:24 +00:00