Commit Graph

922 Commits

Author SHA1 Message Date
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
Fox McCloud
f65c8994ce Broad TG Sound Update (#15608)
* Broad TG Sound Update

* jester update
2021-02-27 11:59:33 +00:00
Fox McCloud
efa3aecb61 Ports TG Pickup, Equip, and Drop Sounds (#15572)
* Ports TG Pickup, Equip, and Drop Sounds

* really
2021-02-24 12:51:59 +00:00
Fox McCloud
78cb60f160 Fixes Some Sounds Having Reverb (#15602)
* Fixes Some Sounds Having Reverb

* typeless
2021-02-24 09:34:34 +00:00
Fox McCloud
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
Fox McCloud
003a1f7cba Tank Refactor; Breathing Retool (#15371)
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
2021-01-28 20:57:37 +00:00
Fox McCloud
de795c4e31 Radiation Refactor (#15331)
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
2021-01-24 22:03:13 +00:00
dearmochi
cc6c6d0389 Adds ability to color patch packs in ChemMaster (#15244) 2021-01-10 20:56:37 +00:00
AffectedArc07
8f72d7556e Annihilates the blackbox (#15132)
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
2020-12-24 16:06:48 -05:00
dearmochi
6ecc3d5234 Add ability to swap items in storage (#13648)
* Add ability to swap items in storage

Add ability to swap items in storage through
drag and drop
Fix "the the" message when putting item in storage
Clean code where possible

* Fix swap in stacked storages, clean up code (v3)

* Ignore restraints and lying for swapping items

* Clean up the code a bit, increase readability

* Clean up code, remove spawn(0)

* Fix some spacing issues

* Rename var, use crisp font
2020-12-22 16:15:40 -05:00
variableundefined
f029dd1dfc Revert "Close storage UI when item becomes inaccessible (#14536)" (#15126)
This reverts commit f54b6904b9.
2020-12-16 22:20:07 +00:00
danni boi
2f3d5bf868 removes magic wall safe exploit (#14890)
* should stop the exploit

* logic was wrong, my bad

Co-authored-by: danni-boy <32673848+danni-boy@users.noreply.github.com>
2020-12-16 15:04:06 -05:00