Commit Graph

40933 Commits

Author SHA1 Message Date
Xhuis 997e38791c Lowercases the names of all glasses 2017-06-24 18:00:22 -04:00
Expletive 567e006fb8 Turns the maid costume's apron into a detachable accessory. (#28527)
* Maid Costume Aprons

* basemap

* woops

* fix
2017-06-24 17:39:28 -03:00
KorPhaeron e8d425b227 Robotic limbs are not weak to glass 2017-06-24 15:53:30 -04:00
Leo f754700a33 Merge pull request #28686 from optimumtact/assessthread
Refactors threat assessment for security bots
2017-06-24 16:50:46 -03:00
KorPhaeron f9e5cb1460 Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit (#28708) 2017-06-24 16:48:28 -03:00
bgobandit 103d2d4e5b Fixes sm slivers not properly deleting (#28724) 2017-06-24 16:46:22 -03:00
ShizCalev ca29c6c510 Varedit cleanup: Mk 4½ (#28715) 2017-06-24 16:43:01 -03:00
KorPhaeron e00cae8d06 Small trees 2017-06-24 15:23:37 -04:00
KorPhaeron 2820180ba6 Mesons for miners 2017-06-24 15:01:57 -04:00
AnturK 1d4820d9cc Fixes whiteship escape (#28734) 2017-06-24 13:48:39 -03:00
AnturK 63716b792d Fixes bad del runtime (#28735)
* Fixes bad del runtime

* Only inserted item uses path here but let's future proof

* QDEL_NULL
2017-06-24 13:47:27 -03:00
Jordie 952e0a67d5 Merge pull request #28727 from Really-Good-Soda-Flavor/NNUUUUUUUUUKE
Fixes nuclear bombs being radioactive
2017-06-24 21:15:09 +10:00
JJRcop bc88709302 Fixes TK remote grab exploit with security cameras 2017-06-23 23:05:58 -04:00
pigeons 95c0e8c33b PDA Refactor Part 1: Phantom Blood Menace (#28681)
* Major PDA cleanup refactor

* Cleans up unecssary vars and helpers

* fixes around dumb cartridge - host_pda handling pre refactor

* whoops forgot about setting the mode

* Fixes cartridge not initializing host pda

* I don't know how vars work

* Initialize memes in cart.dm

* Should've gotten rid of this var
2017-06-23 21:59:17 -05:00
Kyle Spier-Swenson 43cb6b23a1 Fixes the server taking for fucking ever to initialize
Initializations complete within 334 seconds!
vs
Initializations complete within 177.1 seconds!
2017-06-23 19:30:27 -07:00
Joan Lung 39b33f9de9 Merge pull request #28697 from Jordie0608/whyarethepolltypesdefinesthatseemskindasilly
Server polls create only when done being made
2017-06-23 16:50:29 -04:00
Really-Good-Soda-Flavor e48df5338c [READY] New holidays including Thanksgiving and Ramadan (#28054)
* New holidays and weekday helper

* Got rid of var/

* Added separate Thanksgivings and removed an indentation on Tuesday

* Makes Mother's Day less ambiguous.

* Adds Ramadan heck yea

* Gives Ramadan a fixer-upper so it is accurate for a good while
2017-06-23 16:24:28 -04:00
Jordan Brown 37e00d62bd Merge pull request #28716 from lzimann/offhand
Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once
2017-06-23 15:07:37 -04:00
kevinz000 13ec788a50 fixes wormhole jaunters (#28706)
* Update wormhole_jaunter.dm

* Don't feel like waiting for @kevinz000 to do this
2017-06-23 15:01:36 -04:00
Jordan Brown 06c22a1e40 Merge pull request #28714 from ChangelingRain/crusherlighting
Fixes the kinetic crusher not emitting light
2017-06-23 14:49:13 -04:00
Ashe Higgs 2c047bd4c7 Intercoms are now constructable (#28659)
* Intercoms are now constructable

* l a t h e

* replaces on_wall with pixel_shift

* does the thing

* Adds an additional construction step
2017-06-23 14:39:43 -04:00
Expletive 814d34d953 Adds the skull codpiece, an accessory that can be worn above or below an exosuit. (#28479)
* Adds the skull codpiece, an accessory that can be worn above or below an exosuit.

* woops
2017-06-23 14:33:17 -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
Joan Lung 06f2b4f45e Fixes some wizard stuns (#28693) 2017-06-23 07:47:21 -04:00
food 152aabcc4a Fixes nuclear bombs being radioactive 2017-06-22 23:05:49 -04:00
BeeSting12 b86c46b8c1 Fixes the sprite for the nullrod clown dagger skin (#28685) 2017-06-22 22:06:54 -03:00
Leo 9d45a6db23 Merge pull request #28670 from MrStonedOne/fixcidrandomizer
Makes oldchat show while goonchat loads, sends preload messages there.
2017-06-22 21:49:41 -03:00
oranges d6b323bcfa Refactors threat assessment for security bots
They don't share a common ancestor type so they were relying on the
secbot having identical vars to the ed209, this is brittle and ugly, so
instead a bitflag of criteria is passed through the mob assess_threat
proc so it can choose how to react to each criteria

As well as that, the weaponscheck proc used by the bots is now passed
through as a callback, more things can now implement their own
weapons checking for threat assessment if they need

This means more things can now utilise the assess_threat proc if they so
wanted to, as they no longer need to map 1 -> 1 to the ed209's vars

Also fixed a runtime where the secbot didn't pass through itself to the
assess_threat proc (what I originally wanted to fix)
2017-06-22 21:05:22 +00:00
Leo 77dc90bd6b Merge pull request #28682 from tgstation/Cyberboss-patch-2
Fixes a comment typo
2017-06-22 16:33:37 -03:00
Lzimann 88816aae12 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being
qdelled many times.
2017-06-22 16:32:24 -03:00
Joan Lung fdbfe9bd9d Fixes the kinetic crusher not emitting light 2017-06-22 15:10:06 -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
Leo 6eec4d68e1 Merge pull request #28674 from Cyberboss/Cyberboss-patch-1
Fixes an error message
2017-06-22 13:02:36 -03:00
Leo 031b033292 Merge pull request #28677 from ShizCalev/areas-cleanup
Areas.dm cleanup + new icons
2017-06-22 13:02:08 -03:00
Jordan Brown bd94c01f26 Stamina projectiles no longer set off grenades and flamethrowers (#28486) 2017-06-22 12:59:43 -03:00
Leo b0128b17d1 Merge pull request #28665 from ShizCalev/papyrus
Fixes spriteless empty paperbins
2017-06-22 12:58:00 -03:00
Leo 62ae21ea23 Merge pull request #28664 from ShizCalev/shawarma-king
Fixes swarmers dying to radiation
2017-06-22 12:57:47 -03:00
Jordie0608 9c0eff8d5e makes it all work 2017-06-22 22:04:05 +10:00
Jordie e4fc888559 Merge branch 'master' into whyarethepolltypesdefinesthatseemskindasilly 2017-06-22 12:36:33 +10:00
Jordie 07b125cb35 no options for text reply polls 2017-06-22 12:27:39 +10:00
Jordie aefa0cdee4 polls now only sent to db when done being made 2017-06-22 12:13:43 +10: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
Ashe Higgs 4fdd2a37c7 Adds custom lighting support to modular computers, and a flashlight to tablets (#28645)
* Adds light support for modular computers/tablets

* Conflicts 1

* Conflicts 3

* praise the conflicts!

* conflicts again!

* initialize!
2017-06-21 16:42:48 -04:00
Ashe Higgs cbdcd08691 Malf AI module refactor and small additions (#28334)
* Refactors malf AI modules to modern standards

* Updates the goonchat stylesheet

* Moves air and fire alarm overrides

* squash commits!

* Fixes some things

* Review, fixes

* does the thing!

* Requested changes
2017-06-21 15:35:03 -04:00
Jordan Brown eadcb5f592 Merge pull request #28648 from nicbn/typo
Slime processor description more readable
2017-06-21 15:28:48 -04:00
Jordan Brown dc55348493 Fixes a comment typo 2017-06-21 15:13:03 -04:00
Expletive 8e1b56bbd7 Flame thrower plasma tanks can be removed easily. (#28546) 2017-06-21 15:20:57 -03:00
Really-Good-Soda-Flavor 40de86de35 Moves reskinning items to /obj (#28558) 2017-06-21 15:19:17 -03:00
Leo 7155f5feb9 Merge pull request #28639 from AnturK/nice-meme
Fixes SM getting energy when hit in space.
2017-06-21 15:16:51 -03:00