Commit Graph

10267 Commits

Author SHA1 Message Date
bawhoppen 3aed7111e8 frown emoji (#31393) 2017-10-07 20:11:17 -04:00
Jordan Brown 6b9832d661 Merge pull request #31388 from vuonojenmustaturska/atmoscherrypicking
Moves assert_gas() into a define it should always have been, speeding up atmos slightly
2017-10-07 14:36:28 -04:00
Jordan Brown b6d349e1d4 Remove drop_item, drop_item_v, put_in_hands_or_del (#31386) 2017-10-07 13:36:33 -04:00
kevinz000 2a51751dad Lets cyborgs use ladders (#31378) 2017-10-07 09:39:39 -04:00
Jordan Brown 4f860af265 Merge pull request #31383 from BeeSting12/youlights
Fixes grammar on zippos
2017-10-07 09:37:58 -04:00
Kerbin-Fiber dc8450a8f9 Fixes Wood Being Invisible. (#31364)
* Fixes Wood

* Makes jackboots store items small and smaller just like in the description.

* Update internal.dm
2017-10-06 22:45:45 -04:00
vuonojenmustaturska 890ba9dbe1 Imminent danger of skeletons
* Renamed GASLIST into ADD_GAS
* Reordered ASSERT_GAS arguments around
* Replaced all instances of add_gas with the define
* Removed once instance of manual duplication of ASSERT_GAS with the real deal
2017-10-07 04:34:24 +03:00
vuonojenmustaturska feabd41900 Always be alert for skeletons 2017-10-06 20:33:42 +03:00
BeeSting12 4a02903e58 lights to light 2017-10-06 08:34:29 -04:00
Xhuis c4b3bd8a55 Fixes runed metal and brass sprites 2017-10-06 03:18:19 -05:00
ShizCalev 41430d70db Sets decal layer 2017-10-06 03:11:32 -05:00
Tad Hardesty 5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Jordan Brown dd882ba0c3 Removes old ass belt.dm (#31317) 2017-10-05 16:31:34 -04:00
Jordan Brown d3dcc118ec Merge pull request #31340 from Firecage/codeshitnotshit
Does some code standardization/consistency.
2017-10-05 15:53:11 -04:00
XDTM 35d8a55926 Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() (#30525)
* Adds hostile environiment suits

* NOBODY SAW THIS

* the CURSE

* c

* No more stun removal

* fix

* a

* in the chest

* back

* Fixes

* duh

* fucking helmets fucking secbots fucking past coders

* yeah

* REEEEE

* revert to here

* this better work

* cyberboss

* Update effects.dm

* check for charges

* B U L K

* spraycans

* READY

* the if, man

* why the fuck did it convert to spaces

* Fix it
2017-10-05 11:52:47 -04:00
YPOQ 5a616895ed Fixes crafting stacks without breaking crafted machinery (#31298)
* Revert "Fixes stacking when crafting items"

* Fixes crafted stacked items properly

* Update stack.dm
2017-10-05 10:24:34 -04:00
Firecage ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage 2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
Supermichael777 f770b69d5b Makes the pda font a prefernce (#31193) 2017-10-04 21:28:44 -03:00
Leo 85d717350d Merge pull request #31286 from KorPhaeron/ismachinery
ismachinery define
2017-10-04 21:25:31 -03:00
oranges a47dc83a1b Merge pull request #31275 from kingofkosmos/moredeconhints
Adds deconstruction hints to various things
2017-10-05 10:33:09 +13:00
Jordan Brown fdfc4137ee Merge pull request #31245 from Robustin/swordfix
Fixes Cult 2H Sword Soulshards
2017-10-04 14:02:26 -04:00
bawhoppen 9b7f1ada6b Moves all stack object sprites from items_and_weapons.dmi to their own file (#31273)
* keeko

* forgot the file
2017-10-04 12:59:27 -04:00
ExcessiveUseOfCobblestone 9d3dcfbc55 Fixes Carpsie nullrod from being invisible (#31268) 2017-10-04 11:59:44 -04:00
XDTM 6ed612ce77 Adds the advanced medical scanner, gives one to the CMO (#31179)
* Adds the advanced medical scanner, gives one to the CMO

* MORE SCAN DOC

* dots
2017-10-04 12:15:43 +13:00
oranges 47a74d8cf3 Merge pull request #31135 from KorPhaeron/unconvertable
Adds a var to minds that makes them immune to conversion
2017-10-04 12:14:32 +13:00
KorPhaeron 72389743db ismachinery define 2017-10-03 18:13:21 -05:00
oranges 196f1ddc5e Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA
Makes mobs on fire light up
2017-10-04 12:12:49 +13:00
kingofkosmos 2e63bd3dbe Adds deconstruction hints for beds, chairs, closets, grilles, lattices, catwalks, tables, racks, floors, plating and the bookcase. Plus few span fixes. 2017-10-03 18:39:07 +03:00
kevinz000 f8c8d43974 Fixes/tweaks wormholes event and portals (#30846)
* fix

* THERE WE GO

* Update portals.dm
2017-10-03 11:37:16 +02:00
Robustin 9772ac1817 Bastard Sword Soul Fix 2017-10-02 14:58:37 -04:00
KorPhaeron cc309236d9 ismecha define (#31192) 2017-10-02 02:03:40 -04:00
bawhoppen 3e4d747b77 Adds desc to things lacking them. (#31086)
* Desc change

* Update girders.dm

* Update valve.dm

* Update machine_stacking.dm

* Update shuttle_engines.dm

* Update pipe_dispenser.dm

* Update lib_items.dm
2017-10-02 09:07:10 +13:00
ShizCalev 4b0d1a025a Makes mobs on fire light up 2017-10-01 15:15:26 -04:00
Jordan Brown bdec5d5fc4 Merge pull request #31130 from MrDoomBringer/Doom
Adds the Cargo-Tech-of-the-Shift award
2017-10-01 10:42:31 -04:00
kingofkosmos 6a1bb42630 You can now examine an airlock to find out how to construct/deconstruct it (#30605)
* Tweaks rwall construction examine-messages.

* Tweaks window construction examine-messages.

* Added airlock construction examine messages.

* Typo fix.

* Shortened the airlock electronics circuit message.

* Fixed examine text styles.

* Fixes.

* Fixed wall-examine showing on rwalls.

* Made wall and rwall decon hints into a proc. Probably overrode the examine() wrong.

* I missed a > in span. Reinforced falsewall now deconstructs with wirecutters and looks like a real rwall. Changed to a more classy istype-check.

* New reinforced fakewall examine- and attackby-subtypes to get rid of if-istype-reinforced-checks.

* Removed unnecessary rwall-examine.

* Sound full path.
2017-10-01 01:03:43 -04:00
Robustin ec3f7623df 2H Sword to the Cult Forge - Robustin's Github Adventure (#30887)
* Automatic changelog generation for PR #30056 [ci skip]

* Updated old code

* Slowdown does nothing, removed

* Updated Sprites and Fixes

* Mysterious block issue fixed

* Update cult_items.dm

* Update buffs.dm

* Update book.dm

* Update cult_items.dm

* Delete whirlwind.ogg

* Add files via upload

* Delete items_and_weapons.dmi

* Add files via upload

* Shard list fix

* Final error fix

* Review changes, dash datum

* Why was this a diff

* Uses roundstart time for delay

* Simpler Soul Storage
2017-10-01 01:01:50 -04:00
AnturK 69af4a34f7 Fixes dresser being unattackable (#31123) 2017-09-30 10:29:32 -05:00
nicbn 6fb896e4c3 Paper markdown (#30873)
* why it doesn't work

* list thing

* oops

* fixes list. maybe

* Less regex

* wip

* Done I think. I think

* return your functions

* Replace $10 by $a
2017-09-30 09:08:25 -04:00
ShizCalev 51c48409a6 Stops putting RCD, bluespace bags, and staves into ORM (#31093)
* Stops putting RCD, bluespace, and staves into ORM

* CB

* Chat message
2017-09-29 19:33:19 -05:00
ShizCalev 4f4008920f Fixes SM shard extraction (#31111)
* Fixes SM shard extraction

* Space-OSHA called. They want to have a word.
2017-09-29 18:42:40 -05:00
KorPhaeron 5e5ff73046 Adds a var to minds to make them immune to conversion 2017-09-29 16:59:56 -05:00
MrDoomBringer 8343c5c8a3 move around lockbox code hopelessly trying to fix merge conflicts 2017-09-29 17:43:44 -04:00
MrDoomBringer b3f9669144 Add cargo lockbox 2017-09-29 16:12:50 -04:00
ShizCalev bc50c77570 Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110)
* Stops revheads metagaming

* Added comment.
2017-09-29 15:59:57 +13:00
Joan Lung 5b73196dac Reebe is fancier now (#31045)
* Reebe is fancier now

* proper wall baseturf
2017-09-29 15:58:45 +13:00
kingofkosmos 086d636b17 Alt-clicking descriptions when examining (#30988)
* Adds what alt-clicking does into examine-messages.

* whoops fix

* AI holopad examine remove

* Fixed cigarette pack alt-clicking.

* Spear alt-click-message set to show only if explosive lance.
2017-09-29 15:51:31 +13:00
oranges 27f15b7892 Merge pull request #31078 from pubby/opspawn
Cleanup operative landmarks
2017-09-29 15:47:47 +13:00
kevinz000 bd8d9592f1 [READY]Refactors timestops to use fields (#30858)
* kek

* fixes

* Fixes

* fixes

* throw freeze

* woops

* double woops
2017-09-29 15:46:10 +13:00
RandomMarine 2d54930e4d You can now light cigars on burning people (#31081)
* adds lighting cigs on burning mobs

* backslash the

* src
2017-09-28 21:45:17 -05:00