Commit Graph

204 Commits

Author SHA1 Message Date
Barhandar
bcd2b0a3b0 Replaces adding goliath plates to clothing and APLUs with a customizable tracking component (#37525)
add: Amount of goliath plates is now shown in examine for explorer suits and mining hardsuits.


I was peeved by being unable to tell whether the armour is upgraded or not except by trying to stick more plates on it.

I think a more correct way would be to add a plate amount var to these items similarly to APLU plating and then have description mention their amount and, for added transparency, that it's possible to improve it if there's 0 plates.

Please point the errors/wrongs in it, since "current armour value minus constant divided by value each plate adds" is rather clunky code.
2018-05-13 18:55:56 -05:00
Emmett Gaines
b036b1e519 Makes the redirect component able to transfer with changeturfs (#37697) 2018-05-12 16:29:28 -05:00
deathride58
a980e323b9 Merge pull request #6680 from Citadel-Station-13/upstream-merge-37727
[MIRROR] [s] Removes some stationloving-related failure surface
2018-05-11 03:44:29 +00:00
kevinz000
3819a5a9b5 Fixes EMPs (#37656) 2018-05-10 01:33:25 -05:00
vuonojenmustaturska
003eced6af [s] Removes some stationloving-related failure surface (#37727)
COMSIG_TRY_STORAGE_TAKE fails, leaving the disk out-of-bounds. forceMove HAS to be good enough here.
2018-05-08 16:40:56 -05:00
LetterJay
4dd07fe4e7 Merge pull request #6641 from Citadel-Station-13/upstream-merge-37447
[MIRROR] Fixes mousetraps not going off from being dumped out
2018-05-05 09:38:11 -05:00
kevinz000
4a7fae664e Fixes mousetraps not going off from being dumped out (#37447)
* mousetrap fix

* fix mousetraps

* Update storage.dm

* Combine checks
2018-05-04 04:43:12 -05:00
Fox McCloud
f5031bc4f7 Fixes Several Machines Materials Insertion (#37432)
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
2018-05-04 04:40:56 -05:00
deathride58
55566461c6 Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565
[MIRROR] Modifies component transfer to make ChangeTurf able to transfer components
2018-05-02 13:59:14 +00:00
deathride58
f248685db2 Merge pull request #6607 from Citadel-Station-13/upstream-merge-37579
[MIRROR] Fix placing boxes in storage implants
2018-05-02 01:29:41 +00:00
deathride58
613fadf057 Update _concrete.dm 2018-05-01 21:27:01 -04:00
deathride58
e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165
[MIRROR] NTNet improvements!
2018-05-02 01:17:10 +00:00
deathride58
e8f4602716 Update implant.dm 2018-05-01 21:16:05 -04:00
Tad Hardesty
34321883cc Fix placing boxes in storage implants 2018-05-01 07:30:07 -05:00
Jordan Brown
1675490652 Modifies component transfer to make ChangeTurf able to transfer components 2018-04-30 21:16:48 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
6f13d2c2e9 Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380
[MIRROR] Refactors and fixes RPEDs
2018-04-29 22:45:28 +00:00
kevinz000
fe8e1cd61c [syou can no longer insert a storage object into itself, and therefore, no longer bohbomb with one boh (#37410)
* paradox

* fine, byond.

* src.
2018-04-29 15:21:02 -05:00
LetterJay
ab8355968c Update rped.dm 2018-04-29 02:28:43 -05:00
LetterJay
0bca7362e3 Merge pull request #6511 from Citadel-Station-13/upstream-merge-37389
[MIRROR] Removes redundant COMPONENT_INCOMPATIBLE crashes
2018-04-29 02:20:25 -05:00
LetterJay
57270f84d9 Merge pull request #6493 from Citadel-Station-13/upstream-merge-37299
[MIRROR] Fixes ghosts being unable to see into nonadjacent bags
2018-04-29 02:19:14 -05:00
kevinz000
6ed120aad4 NTNet improvements! 2018-04-27 20:24:28 -05:00
Dax Dupont
4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
vuonojenmustaturska
d6b48869d8 Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436)
* station lovin' happened so fast

* Update stationloving.dm

* less qdel memes

* imbue soul signal

* rename imbue soul signal

* dupemode

* henk

* Update atoms_movable.dm

* Update nuclearbomb.dm

* Update nuclearbomb.dm
2018-04-27 07:37:15 -05:00
deathride58
80a4f04d94 Merge pull request #6524 from Citadel-Station-13/upstream-merge-37342
[MIRROR] Makes it possible to see tiles past z transitions
2018-04-27 09:39:52 +00:00
deathride58
505458cfc9 Update riding.dm 2018-04-27 05:34:06 -04:00
deathride58
6d8ade932d Update lockon_aiming.dm 2018-04-27 05:33:37 -04:00
deathride58
d37ff6135a Merge branch 'master' into upstream-merge-37389 2018-04-27 09:32:54 +00:00
deathride58
634e896e11 Merge branch 'master' into upstream-merge-37299 2018-04-27 09:22:31 +00:00
deathride58
c17d48affe Merge pull request #6485 from Citadel-Station-13/upstream-merge-37359
[MIRROR] Fixes thermite immunities [s]
2018-04-27 09:17:43 +00:00
Jordan Brown
5994a9fd0b Merge pull request #37342 from ninjanomnom/vis-border
Makes it possible to see tiles past z transitions
2018-04-26 15:25:36 -05:00
Jordan Brown
f0a259d3e5 Removes redundant COMPONENT_INCOMPATIBLE crashes 2018-04-25 05:54:41 -05:00
Jordan Brown
1cdea15616 Fixes ghosts being unable to see into nonadjacent bags 2018-04-23 09:03:27 -05:00
AnturK
1d3f9bd4ec Fixes thermite immunities (#37359) 2018-04-23 02:06:22 -05:00
Poojawa
e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00
kevinz000
44a273f6b8 Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable) (#37167)
* Emergency NTNet patch

* ok

* @naksu

* explicit null
2018-04-14 04:43:25 -05:00
vuonojenmustaturska
d559fc1bd3 remove 512 version checks 2018-04-11 14:26:41 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
AnturK
bdf2f65a8f Fixes swarming runtime 2018-04-09 11:06:28 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Grandmother of 50
2d710e863f Archaeology... .... Code Cleanup (One day I promise!) (#36490)
* Improves Arch Code

* defines and stack_traces null values

* relocates 2 defines to "non-signal" section
2018-04-02 18:14:15 -05:00
LetterJay
022ac2e6c3 Merge pull request #6178 from Citadel-Station-13/shit
sanity
2018-04-01 19:51:39 -05:00
LetterJay
dd579e35bc Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548
[MIRROR] Added a new ability to sentient diseases
2018-04-01 19:50:43 -05:00
LetterJay
24d4b310cd Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147
[MIRROR] [READY] ~SPELL CARDS~, homing projectiles, and more!
2018-04-01 01:01:55 -05:00
Cruix
0b7f816033 Added a new ability to sentient diseases 2018-03-31 06:14:54 -05:00
kevinz000
84ac06c986 Yeah no 2018-03-31 04:07:29 -07:00
BeeSting12
cb8f3e9293 >happend 2018-03-28 12:17:14 -05:00
deathride58
ebc51d94bf Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398
[MIRROR] [READY]pathfinding circuitry upgrade
2018-03-27 17:47:11 +00:00
arsserpentarium
303272319a [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 11:01:22 -05:00
kevinz000
4773743eab Fixes wet floor scaling (#36697)
* Fixes wet floor scaling

* Meh lets not
2018-03-26 10:49:42 -05:00