Commit Graph

4079 Commits

Author SHA1 Message Date
Ashe Higgs 2438bd2aa8 Small belt overlay rewrite, and tool overlays for toolbelts (#29180)
* Belt overlay tweaks, tool overlays

* Belt overlays now have their own file

* work on porting to the new screwy looks

* Work on screwdrivers

* Fixes screwdrivers

* really SCREWED that one up!
2017-07-19 15:29:35 +01:00
ShizCalev 45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Leo fea979b46a Merge pull request #29303 from kevinz000/patch-255
Fixes flashbang stun times
2017-07-17 22:13:46 -03:00
Joan Lung ca06bc22e6 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#29232) 2017-07-17 12:25:01 -03:00
Jordan Brown de3f268385 Merge pull request #29262 from ChangelingRain/rpdtweak
RPDs can now place disposals pipes on dense non-wall turfs
2017-07-16 12:50:05 -04:00
Leo ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00
kevinz000 ce1568190b Update flashbang.dm 2017-07-16 06:01:44 -07:00
Jordan Brown bf4373958e Merge pull request #29233 from optimumtact/bumped
Rename Bumped to CollidedWith
2017-07-15 11:29:41 -04:00
ShizCalev db10f35703 Cleaned up some emag_acts (#29238)
* cleaned up some emag_acts

* Randomized spark sounds

* Made sparky looking things sound sparky too

* early return
2017-07-15 11:27:50 -04:00
Fox McCloud 2cc3e9c41f Disease Refactor (#29130)
* Vomit Now Contains Viruses

* eh

* typeless memery

* Disease Refactor

* tweaks

* styling

* tweaks

* unecessary comment removal

* whoops

* fix
2017-07-15 11:08:40 -04:00
oranges e04fd83b9d Rename Bumped to CollidedWith
In light of the change of Bump to Collide, this should also be done
as it will make it less confusing for devs in the future

I also ended up changing a bunch of the code in the CollidedWith procs,
things that were assuming types, doing bad loc changes and so forth
2017-07-15 00:25:22 +00:00
Joan Lung 6b1bc117e2 as done 2017-07-14 15:40:24 -04:00
Joan Lung 2551794b5d RPDs can now place pipes on walls 2017-07-14 15:25:12 -04:00
Ashe Higgs 102d1cce25 Refactors screwdriver coloring to use greyscale (#29199)
* Removes some debug code

* get outta here!

* Replaces random sprites with the old colors

* Sorts out inhands

* Dynamics inhaaaaaands

* stop eavesdropping, world!

* Sprite updates

* Conflicts 1

* Conflicts!

* Conflicts 1

* No conflicts!
2017-07-14 13:53:28 +02:00
kevinz000 7a26305498 Replaces ex_act and emp_act numbers with defines (#29215)
* defines

* defines

* explode_none
2017-07-13 08:56:26 -03:00
Ashe Higgs 77f8b362fc Adds a 'nemesis faction' system to transforming weapons (#28826)
* Minor generalizations of the cleaving saw

* Some fixes and refactors

* Update transforming.dm
2017-07-12 17:02:52 -04:00
Xhuis 0afa80d23a Welding tool icons now use overlays 2017-07-11 12:56:39 -04:00
Jordan Brown d135dc2643 Merge pull request #29162 from ChangelingRain/directionliststweak
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Jordan Brown afc5640fd6 Merge pull request #29145 from kevinz000/patch-244
Updates vending refill packs to reflect additional items added in headphones PR
2017-07-09 20:45:08 -04:00
Jordan Brown d4e5cfd5a3 Merge pull request #29140 from ChangelingRain/integrity
Removes now-unnecessary obj_integrity definitions
2017-07-09 20:43:44 -04:00
Joan Lung ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
kevinz000 248cf95273 Update flashbang.dm (#29136) 2017-07-09 08:43:43 -03:00
kevinz000 5e80b018eb Update vending_items.dm 2017-07-08 13:57:10 -07:00
Joan Lung 1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
Tacolizard 5868aedcab initial (#29075) 2017-07-06 22:10:01 -03:00
Jordan Brown a2d25af44b Merge pull request #29006 from Xhuis/twohand_storage_fix
Fixes forced two-handed weapons being unstorable
2017-07-05 20:52:03 -04:00
PKPenguin321 2d599e1b97 Adds the circle game (#28961)
* adds the circle game
- adds an inventory sprite to weapons.dmi
- adds the code for the hand "object" to weaponry.dm
- adds emote datum code for making your hand a circle to emote.dm

* fixes
- makes sure the emote is actually ran before creating objects
- qdels the new object if it fails to get placed into the mobs hand

* adds a message to the user when emote fails

* added special examine reactions
- added new proc to items.dm
- added handling for the proc in human/examine.dm
- added special examine reaction to the circled hand in weaponry.dm
- removed a check on the circle emote that made it not work in emote.dm

* defines, a fix

* undoes last two commits
2017-07-04 22:25:51 -04:00
Xhuis 334df25e69 show them messages 2017-07-04 11:03:34 -04:00
Pigeons d5159f0e35 Fixes for charter autoaccept 2017-07-03 20:52:34 -04:00
Xhuis 8ad0737cf5 Forced two-handed objects can now be stored 2017-07-03 11:01:43 -04:00
Ergovisavi a08aa9e3a2 Fixes resin stacking & allows lasers to pass through resin (#28842)
* Fixes resin stacking
Lets you shoot through Resin with lasers!

* Small code cleanup

* TRUE
2017-06-27 09:29:26 -04:00
Really-Good-Soda-Flavor 930b15e625 Adds container types INJECTABLE and DRAWABLE (#28853)
* Adds container types INJECTABLE and DRAWABLE

* Make the chemistry readme a text file and updates it!

* Unfucks the readme!

* Another attempt at fixing the readme

* Remove the readme from the .dme

why was it a dm file!!
2017-06-27 09:19:25 -04:00
Joan Lung 601ad4beda Adds the Cleaving Saw as what will be the reward for killing a miniboss (#28565)
* Adds the Cleaving Saw as what will be a reward for killing a miniboss

* slashslice

* wowduh

* some tweaks

* bleed!

* a little slower

* Smaller cleave, higher damage

* more info

* saw icon

* It's finally dooooone!

* done
2017-06-25 12:49:32 -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
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
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
BeeSting12 b86c46b8c1 Fixes the sprite for the nullrod clown dagger skin (#28685) 2017-06-22 22:06:54 -03:00
Lzimann 88816aae12 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being
qdelled many times.
2017-06-22 16:32:24 -03:00
nicbn 77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Jordan Brown bd94c01f26 Stamina projectiles no longer set off grenades and flamethrowers (#28486) 2017-06-22 12:59:43 -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
Expletive 8e1b56bbd7 Flame thrower plasma tanks can be removed easily. (#28546) 2017-06-21 15:20:57 -03:00
ClosingBracket ed1855f5c8 Fixed small spelling + punctuation errors (#28631) 2017-06-21 09:43:59 -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
bgobandit 078a1e45a6 Lavaland mushrooms and plants can now be cultivated. (#28533) 2017-06-20 20:05:31 -03:00
Jordan Brown 6126cbe705 Merge pull request #28612 from Bawhoppen/3branch
Fixes grenade belt and bandolier UI obscuring half the screen
2017-06-20 16:36:23 -04:00
bawhoppen bcb87d9135 truth 2017-06-20 15:25:51 -05:00