0877bdd4e5
Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646
...
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-15 00:47:59 -05:00
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
c1bbdd2f65
Merge pull request #6721 from Citadel-Station-13/upstream-merge-37752
...
[MIRROR] (NOT TESTED YET) Fixes Bedbuckling to avoid Floor is Lava
2018-05-13 03:30:15 -05:00
289cbbb375
Merge pull request #6718 from Citadel-Station-13/upstream-merge-37697
...
[MIRROR] Makes the redirect component able to transfer with changeturfs
2018-05-13 03:28:57 -05:00
023f93f734
Fixes Bedbuckling to avoid Floor is Lava ( #37752 )
...
* Update floor_is_lava.dm
* Pulls the check out of the loop.
2018-05-12 17:44:12 -05:00
b036b1e519
Makes the redirect component able to transfer with changeturfs ( #37697 )
2018-05-12 16:29:28 -05:00
d0a5aaa4ee
family heirlooms properly open the bag upon spawning if they're in the bag ( #37754 )
2018-05-11 17:30:49 -05:00
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
b38424653c
Merge pull request #6703 from Citadel-Station-13/upstream-merge-37656
...
[MIRROR] Fixes EMPs not working on people/backpacks/other storage being carried on people
2018-05-11 03:36:01 +00:00
ed41769e10
Merge pull request #37761 from MrStonedOne/patch-503
...
Adds time_dilation info to status topic.
2018-05-10 15:50:59 -05:00
3819a5a9b5
Fixes EMPs ( #37656 )
2018-05-10 01:33:25 -05:00
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
5d38c10581
Merge pull request #6661 from Citadel-Station-13/upstream-merge-37712
...
[MIRROR] Fixes a radiation runtime related to going off the map edge
2018-05-07 12:46:00 +00:00
9b7518e1e2
Merge pull request #6665 from Citadel-Station-13/upstream-merge-37578
...
[MIRROR] Fix the top menus in the skin not working
2018-05-07 12:44:35 +00:00
034bf6ce79
Update verbs.dm
2018-05-06 17:38:25 -04:00
0d7a0c0418
Merge pull request #37679 from DaxDupont/death
...
Fixes rhumba beat as requested by naksu
2018-05-06 16:38:16 -05:00
af5e898dab
Fix the top menus in the skin not working
2018-05-06 16:37:31 -05:00
e0412f6325
Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-06 16:37:13 -05:00
56e9fcd29c
Merge pull request #37712 from ninjanomnom/dont-step-off-the-edge
...
Fixes a radiation runtime related to going off the map edge
2018-05-06 16:36:54 -05:00
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
889716fbd6
Merge pull request #6645 from Citadel-Station-13/upstream-merge-37640
...
[MIRROR] Lengthen commit hashes in Show Server Revision
2018-05-05 09:35:31 -05:00
908394f1e2
Merge pull request #6640 from Citadel-Station-13/upstream-merge-37432
...
[MIRROR] Fixes Several Machines Materials Insertion
2018-05-04 22:57:32 -05:00
7bab794c6b
Merge pull request #6627 from Citadel-Station-13/upstream-merge-37455
...
[MIRROR] deadly brain tumor now gives -3 points
2018-05-04 22:47:13 -05:00
1aa0091ec1
Merge pull request #37640 from AutomaticFrenzy/patch/server-revision
...
Lengthen commit hashes in Show Server Revision
2018-05-04 08:42:44 -05:00
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
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
288c61b1c1
obfuscates the gamemode in topic() calls
2018-05-03 21:14:15 -04:00
fa6292dbd5
deadly brain tumor now gives -3 points ( #37455 )
...
* i can tweak it if need be yadda yadda one line change
* ok lets be SENSIBLE.
2018-05-02 21:24:26 -05:00
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
f35bfa22e4
Merge pull request #6614 from Citadel-Station-13/upstream-merge-37475
...
[MIRROR] H.O.G.A.N. lawset
2018-05-02 01:33:19 +00:00
5c40a38457
Merge pull request #6609 from Citadel-Station-13/upstream-merge-37584
...
[MIRROR] Readds missing nuked narsie cinematic.
2018-05-02 01:30:19 +00:00
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
613fadf057
Update _concrete.dm
2018-05-01 21:27:01 -04:00
d26ba53e91
Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513
...
[MIRROR] Adds traits for a character's preference towards pineapples.
2018-05-02 01:25:04 +00:00
4851b9bd82
Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501
...
[MIRROR] Fixes missing icons
2018-05-02 01:19:58 +00:00
e26f1cd78b
Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165
...
[MIRROR] NTNet improvements!
2018-05-02 01:17:10 +00:00
e8f4602716
Update implant.dm
2018-05-01 21:16:05 -04:00
d47b71cf23
Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER
...
H.O.G.A.N. lawset
2018-05-01 15:40:09 -05:00
76302a217e
Readds missing nuked narsie cinematic. ( #37584 )
2018-05-01 11:05:16 -05:00
34321883cc
Fix placing boxes in storage implants
2018-05-01 07:30:07 -05:00
1675490652
Modifies component transfer to make ChangeTurf able to transfer components
2018-04-30 21:16:48 -05:00
12eb6a8a97
Merge pull request #37513 from ShizCalev/pineapple-memes
...
Adds traits for a character's preference towards pineapples.
2018-04-30 13:02:05 -05:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
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
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
ab8355968c
Update rped.dm
2018-04-29 02:28:43 -05:00
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
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
db142667b7
Merge pull request #37501 from ShizCalev/icon-fixes
...
Fixes missing icons
2018-04-28 14:54:45 -05:00
6ed120aad4
NTNet improvements!
2018-04-27 20:24:28 -05:00
LetterJay