Commit Graph
23 Commits
Author SHA1 Message Date
DrathekandGitHub 7c8bb85de3 Whitespace Standardization [MDB IGNORE] (#15748)
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.

* Attempt to normalize example.yml (and another file I guess)

* Try again
2024-02-20 11:28:51 +01:00
Heroman 164659ac4f Fixes runtime with applying lipstick to others 2022-12-24 16:47:33 +10:00
NovacatandGitHub 1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00
MistakeNot4892andVirgoBot 3f9af78f3a /atom New() => Initialize() [MDB IGNORE] 2021-11-14 03:09:51 -05:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
ShadowLarkens f156857e14 TGUI Appearance Editor (Mirrors & Admin) 2020-08-10 08:08:33 -07:00
AtermoneraandVirgoBot 8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Arokha SieyesandLeshana 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
AtermoneraandVirgoBot ef4c7b6601 Merge pull request #6172 from mistyLuminescence/contacts
Makeover Kit
2019-05-28 13:10:09 -04:00
Arokha Sieyes 10aabd98da POLARIS: 3000% human/update_icons() improvement
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
Eearslya SleiarionandSpades 868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
SinTwo cba8cdcde8 Fixes #2036 2016-08-15 10:38:32 -04:00
SinTwo 7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Kelenius afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Zuhayr 48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
mwerezak f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
GinjaNinja32 c77605265c code/game/objects, code/game/machinery merge fix 2015-06-02 20:18:45 +01:00
Akai Alonkai c6b66a1000 Defines icon file for purple comb
Fixes #8133
2015-02-18 15:09:40 -05:00
Kelenius 10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
mwerezak a9399c2b79 Custom loadout updates
Adds sorting to the custom gear menu list.
Adds the white cheongsam as a custom gear item.
Moves the purple comb out of the custom item defines as it is no longer
just a custom item.
Adds pockets to the bomber jacket.
Reduces the cost of ponchos to 3.
2014-11-01 15:56:11 -04:00
Walter0o a586c1dd70 remove double paper/attack() definition 2014-08-03 13:52:47 +02:00
Kyrah AbattoirandMloc-Argent 98f02be5a6 code/game/object/items/weapons/* lowercase pass
code/game/object/structure/* lowercase pass (start)

Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/game/objects/items/weapons/paint.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/vending_items.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/structures/bedsheet_bin.dm
	code/game/objects/structures/door_assembly.dm
2014-01-08 19:56:00 +00:00
petethegoat@gmail.com c016c10bfa Fixes issue 955. (Signalers don't update bomb overlays)
Fixes issue 957. (Sexy mime costume causes incorrectly coloured cleavage)

Adds lipstick~
There are four colours to choose from, and they can be found in contraband crates. You can wipe off lipstick with paper.

Adds some feedback for when the invisimin verb is used.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4739 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-23 15:31:01 +00:00