Commit Graph

2670 Commits

Author SHA1 Message Date
shizcalev efef14d1bb Updated closet name 2017-07-10 01:48:00 -04:00
shizcalev 30e0d4b270 [Box] Removes stray fan in engineering
fixes #28862
2017-07-10 01:22:40 -04:00
Joan Lung 1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
MoreRobustThanYou b96bc440db Fixes plasma glass merging with normal glass (#29114)
* Fixes plasma glass merging with normal glass

* Update window.dm

* Update smelting_designs.dm
2017-07-08 10:44:32 -04:00
Jordan Brown e89408c15e Merge pull request #29112 from MoreRobustThanYou/patch-4
Reinforced Plasma Glass is more SME-worthy
2017-07-08 10:43:57 -04:00
Joan Lung bbdfed3c2a Dreams while sleeping are now slightly longer on average and will contain more possibilities (#29104)
* Dreams while sleeping are now slightly longer on average and will contain more possibilities

* I don't think this is worth it at all but sure whatever

* are you dreaming too

* dream
2017-07-07 22:17:57 -04:00
MoreRobustThanYou 6c31809bf0 Update window.dm 2017-07-07 15:11:53 -04:00
MoreRobustThanYou cdde74d82b Update window.dm 2017-07-07 14:16:03 -04:00
MoreRobustThanYou f97f0afa7f Update window.dm 2017-07-07 09:18:54 -04:00
MoreRobustThanYou 289567a2f1 Update window.dm 2017-07-07 08:30:04 -04:00
MoreRobustThanYou 70f1f9a40d Update window.dm 2017-07-07 08:22:33 -04:00
MoreRobustThanYou 30c00659a9 Update window.dm 2017-07-07 07:56:23 -04:00
MoreRobustThanYou c172578fda Ups the intergrity of reinforced plasma windows
They need to be SME-worthy
2017-07-07 07:48:55 -04:00
Joan Lung ddeab5f6e3 Windows now have the proper starting health 2017-07-06 17:44:50 -04:00
Jordan Brown ce590cd648 Fixes windows not returning an Initialize hint (#29038) 2017-07-06 13:03:23 -03:00
Jordan Brown 691ba8d67f Removes the need for specifying obj_integrity (#29030) 2017-07-06 11:23:38 -03:00
ShizCalev c950cb88d4 Replaces highpressure windows with plasma windows (#29051)
* replaces windows

* replaces all instances of highpressure windows

* spacing cleanup
2017-07-06 10:11:44 -04:00
Jordan Brown 94b2134db1 Merge pull request #29050 from ShizCalev/plasma-window-fix
Fixes plasma window sprite
2017-07-06 10:10:54 -04:00
Shadowlight213 91c92c788c Gives ghost roles their own assigned_roles (#29044)
* Gives ghost roles their own assigned_role in mind.

* vars

* skeleton
2017-07-05 20:45:48 -04:00
shizcalev 059d6375ee why were r-plasma windows named that 2017-07-05 01:17:11 -04:00
shizcalev 08808ff7b7 fixes plasma window sprite 2017-07-05 00:52:06 -04:00
Steelpoint c3b00bce43 [Ancient Station] First Round Of Changes/Additions (#28843)
* InitialCommit

* BannersAndFixes

* NewChanges

* FinalChanges

* InitializeFix

* Typo

* MinorFixes

* MoreFixes
2017-07-05 00:22:16 -04:00
MoreRobustThanYou aa7c60eb1f Ports plasma glass windows from /vg/ (#29024)
* add plasma window textures

* plasma glass sheets

* Update glass.dm

* Update window.dm

* Whoops!

* Update glass.dm

* Update glass.dm

* UHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH

* this is what I get for coding while being awake for nearly 24 hours

* SMOOTHIES

* Update window.dm

* return return RETURN

* who cares

for some reason paperframes had trues and all that... i hate byond

* updated dmi snoothie thins

* Add files via upload

* thanks @Cyberboss- thump... zzzzzzzzzzz

seriously i am so tired right now

* AYYYy yayyy I SAID YEAHHHH, what's GOIN ONN

* Update glass.dm

* EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

* ooga booga

* Update window.dm

* Update smelting_designs.dm

* Update smelting_designs.dm

* Update glass.dm

* Update window.dm

* Update glass.dm

* reee

* WHOOPS!

* Well, if ya say so

* Update glass.dm

* Update glass.dm

* uhhh....?

* Update window.dm

* Update glass.dm

* Add files via upload

* Update window.dm

* Update glass.dm
2017-07-04 22:27:58 -04:00
oranges ae3740d84b use_power var now uses a define to reflect it not being a bool
NO_POWER_USE
IDLE_POWER_USE
ACTIVE_POWER_USE

holopads now correctly set use_power and the active_power_usage
2017-06-29 23:50:16 +00:00
Joan Lung d165ecc6f2 Rethemes the Necropolis (#28857)
* Rethemes the Necropolis

* clen

* not clever enough, hmm...

* that's a bug. hello, bug.

* no message

* a terrifying Legion room. full of one (1) Legion.

* some tweaks, inside has actual floor type

* tweaks
2017-06-27 18:49:30 -03:00
Jordan Brown dfc5a47c7e Merge pull request #28765 from KorPhaeron/tree
Small jungle trees
2017-06-26 10:41:52 -04:00
KorPhaeron 1fde4943b5 Initialize 2017-06-26 10:13:25 -04:00
KorPhaeron f5a1ce0492 Uses the proper icon file 2017-06-26 09:29:52 -04:00
Steelpoint f8ee37afc0 Ancient Space Station [Space Spawn Ruin] (#28584)
* FirstCommit

* HardsuitAncientSounds

* FurtherWorkSave

* HivebotSpriteMinorMapChange

* FinalFixesPrePR

* MinorFixes

* FixesPart1

* TGMMap

* Wording

* VoidSuitPlusSpelling

* TGMConv

* MoreSpelling

* RadioStorm

* SomehowGotThisToWork
2017-06-25 12:02:31 -04:00
Steelpoint 56a4c179b4 Station Engineers Spawn With Industrial Welder (#28740)
* InitialCommit

* LargeToSmall
2017-06-25 10:17:14 -04:00
KorPhaeron e00cae8d06 Small trees 2017-06-24 15:23:37 -04:00
Joan Lung deae811756 Unconscious and Knockdown are now status effects (#28696)
* Unconscious and Knockdown are now status effects

* Fixes #28628

* fixes borgs

* the terrifying second argument

* Much better
2017-06-23 12:00:49 -04:00
nicbn 77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Leo 4ac64a7014 Merge pull request #28673 from ShizCalev/sheet-fixes
Readds sprites for grey & nanotrasen bedsheets
2017-06-22 13:03:14 -03:00
Joan Lung 58c054acb5 Stun is now a status effect (#28654)
* Stun is now a status effect

* I'D RATHER NOT

* smart

* very smart

* pideyview

* small fixes

* slight fix
2017-06-22 10:50:46 +10:00
shizcalev 1ee552ec0e readds sprites for grey and nantotrasen bedsheets
fixes #26500
fixes #28671
fixes #24468
2017-06-21 09:39:13 -04:00
bawhoppen b666bd58b0 Makes dressers buildable (#28611) 2017-06-21 09:45:04 -03:00
Jordan Brown 2a35e1c2ac Merge pull request #28588 from Ergovisavi/atmos_backpack_again
Changes to the Atmos Watertank Backpack
2017-06-20 21:49:02 -04:00
Ergovisavi e1bdd83020 Changes the holo-fan to the holo-firelock, other minor changes and fixes 2017-06-20 18:36:45 -07:00
Jordan Brown 6440a70ec2 Merge pull request #28605 from ChangelingRain/slipfix
Fixes slips
2017-06-20 15:49:45 -04:00
Jordan Brown 1c8badd8fe Merge pull request #28590 from optimumtact/korthemoorstrikesthebooritsquiteashorethatbringsustothefore
Refactors hitreaction to pass in the hitting atom
2017-06-20 09:21:14 -04:00
oranges 186d17b77b Refactors hitreaction to pass in the hitting atom
Required some upstream changes to the check_shields proc to also
reliably pass in the atom
2017-06-20 02:48:17 +00:00
Joan Lung 38ec5563dc Fixes slips 2017-06-19 14:57:25 -04:00
Ergovisavi 9f30277c2d Take two at making ATMOS actually capable of fixing ATMOS in a timely manner 2017-06-19 00:24:01 -07:00
Joan Lung 2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
Expletive 1860e1a2ea Paper frames, but with new sprites. (#28452)
* Paper frames, take two

* With entirely new sprites

* and basemap

* no directional doors also smoothing

* changes requested

* woops

* deconstruct -> Destroy
2017-06-18 10:45:35 -04:00
Jordan Brown 187ae0bd0e Merge pull request #28419 from Expletive/pocketprotectors
Gives Pocket protectors to various nerdy jobs on the station.
2017-06-17 16:13:09 -04:00
Joan Lung 8fd4098d2e Merge pull request #28506 from RandomMarine/RCDvals
Makes RCD ammo use consistent + small speed tweaks
2017-06-17 15:55:54 -04:00
Leo 65b7f252fc Merge pull request #28487 from Steelpoint/hosrdlocktwo
Head of Security/Research Director fluff items now below standard equipment. Ver 2
2017-06-16 14:45:37 -03:00
RandomMarine 815233a2ea RCD ammo use consistency 2017-06-15 22:57:17 -07:00