Commit Graph

405 Commits

Author SHA1 Message Date
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJay
5fff5e3968 Merge pull request #6918 from Citadel-Station-13/upstream-merge-38003
[MIRROR] Gun overlays 2: Electric boogaloo.
2018-05-27 14:41:57 -05:00
Dax Dupont
74932ddce0 Gun overlays 2: Electric boogaloo. (#38003)
* Reduces selfcharge gun processing/icon work

* More efficient gun overlays, adds old_ratio var

* oh my god it was calling the egun's update_icon?

* percent proc

* Attachment overlay overhaul

* Cut overlays in egun update

* ebow 1000% better overlay management

* Update gun.dm

* Pointless check

* Giving KA and children consistent icon behavior

* Update kinetic_accelerator.dm

* Fixed

* ..() readded

* ..() readded

* ..() readded

* Antur didnt catch this one heck

* Because confusing vars are apparently more maintainable

* Gun overlays 2: Electric boogaloo

* another one

* Chameleon guns are removed

* tentacles everywhere
2018-05-27 11:41:14 -05:00
GuyonBroadway
0082b0f2c0 Ports gloves of the north star from Hippie (#37864)
* Ports gloves of the north star from Hippie

* Doing a white line

* adds customiseable warcry and sprites by Notamaniac

* star with a capital S

* Nitpick grammar
2018-05-27 11:40:47 -05:00
KorPhaeron
64ead10924 Fixes reactive repulse armour (#37999) 2018-05-23 21:00:10 -05:00
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
[MIRROR] Makes more messages pronoun sensitive
2018-05-23 07:46:26 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJay
be6fd4f0ca Update vg_hats.dm 2018-05-21 12:33:14 -05:00
LetterJay
359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
LetterJay
931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
LetterJay
1e207a7430 modular_citadel 2018-05-20 23:04:13 -05:00
CitadelStationBot
8b5c2d3108 Merge pull request #6739 from Citadel-Station-13/upstream-merge-37525
[MIRROR] Replaces adding goliath plates to clothing and APLUs with a customizable tracking component
2018-05-13 20:38:49 -05:00
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
vuonojenmustaturska
998e49da06 Merge pull request #37809 from Qbopper/secskirts
Adds security jumpskirts this time with less broken github
2018-05-13 12:11:02 -05:00
LetterJay
cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558
[MIRROR] Anomaly Armour Research
2018-05-12 21:36:51 -05:00
LetterJay
6d5ace8227 Merge pull request #6707 from Citadel-Station-13/upstream-merge-37782
[MIRROR] [s] Fixes an admin unprotected var read/write exploit
2018-05-12 17:04:39 -05:00
deathride58
20ac9089a7 Merge pull request #6678 from Citadel-Station-13/upstream-merge-37710
[MIRROR] Makes eye of god lava & fire proof
2018-05-11 03:45:28 +00:00
deathride58
b0d896a19b Update armor.dm 2018-05-10 23:42:56 -04:00
deathride58
8954754e7a Merge pull request #6684 from Citadel-Station-13/upstream-merge-37683
[MIRROR] Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values.
2018-05-11 03:41:53 +00:00
deathride58
e0f971ecbb Merge pull request #6693 from Citadel-Station-13/upstream-merge-37457
[MIRROR] Adds a French beret! HONH HONH HONH!
2018-05-11 03:41:26 +00:00
deathride58
76ab6ff658 Update clothing.dm 2018-05-10 23:34:46 -04:00
Jordan Brown
d8bef8e04e [s] Fixes an admin unprotected var read/write exploit 2018-05-10 13:39:42 -05:00
kevinz000
44dac80383 Makes it a bit easier to see radiation 2018-05-09 16:20:48 -05:00
Ordonis
ab81220eda Adds a French beret! HONH HONH HONH! (#37457)
This is very similar to the Italian Moustache, but it's a beret. This will be part of a series of language items. Happy to entertain suggestions as to whether it should be a roundstart item or randomly scattered about maint/cargo crate restricted. In the spirit of atomizing PRs, this one will just be for the French Beret.

Ready for merge.
2018-05-09 16:03:28 -05:00
KorPhaeron
cc8fb19166 Anomaly Armour Research 2018-05-09 15:55:03 -05:00
Firecage
694726e89d Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values. (#37683)
* removes the block chance from the Roman Shield.

* replaces the Roman Shield in the autodrobe with a toy version with no block chance.

* replaces the armoured roman helmets from the autodrobe with fake ones.
2018-05-09 00:49:19 -05:00
FrozenGuy5
a4410b2aec Makes eye of god lava & fire proof (#37710)
* Makes eye of god lava & fire proof

* eye of god is fire and lava proof
2018-05-08 13:21:37 -05:00
deathride58
50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
deathride58
474d980a9b Update _ears.dm 2018-05-06 03:11:29 -04:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00: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
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
vuonojenmustaturska
0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
deathride58
4851b9bd82 Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501
[MIRROR] Fixes missing icons
2018-05-02 01:19:58 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
ShizCalev
1478e17fea Fixes invisible turtleneck alt state 2018-04-29 10:04:52 -05:00
Jordan Brown
db142667b7 Merge pull request #37501 from ShizCalev/icon-fixes
Fixes missing icons
2018-04-28 14:54:45 -05:00
vuonojenmustaturska
3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
KorPhaeron
b36d88900f Makes engine goggle numbers more visible (#37324) 2018-04-22 19:21:13 -05:00
vuonojenmustaturska
ed201bc65d Gives mining bots back their mesons (#37196)
* Gives mining bots back their mesons

* qdel
2018-04-16 04:36:40 -05:00
Tlaltecuhtli
3ffe415eb8 sucessfully fixes some grammar (#37095)
* sucessfully fixes some grammar

/🆑
grammar:fix
🆑

* fixes kevin spelling words in albanian

* tfffaerfvvjjewwaazcb

* does this work

* what if this works

* sdad

* ok
2018-04-14 08:12:34 -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
kevinz000
65097bb4e4 runtime 2018-03-31 06:16:05 -05:00
iksyp
c0e45aa0a8 Night vision goggles no longer cancel out thermal eyes (#36609)
cl
fix: night vision goggles no longer overwrite thermal eyes. nvg eyes no longer overwrite thermal goggles.
/cl

fixes #35921
2018-03-28 12:16:38 -05:00
Poojawa
b4a7def5ca Hypospray kits and reworks! (#5907)
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
2018-03-21 15:28:06 -05:00