Commit Graph

320 Commits

Author SHA1 Message Date
pubby
65bb0a3e32 Ammo cleanup (#30361)
* Clean up ammo

* Fix maps

* Cyberboss ammo cleanup fixes
2017-09-07 11:02:44 -04:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Joan Lung
36d70f3114 Removes bows 2017-07-26 18:39:57 -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
bgobandit
ed01357edd This month's spelling fix PR (#28502) 2017-06-17 09:35:30 -03:00
Lzimann
3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
InsaneHyena
5713a44048 Removes donut steelpoint (#28041) 2017-06-05 00:12:26 -03:00
Steelpoint
03b31490dd [Lavaland Ruin] Crashed Marine Transport (#27660)
* InitialCommit

* MergeConflict

* Mistakesweremade

* MissingText

* MoreFixesAndBlackList

* Tweaks

* FixedIssues

* FinalFixHopefully

* NewWalls

* IDCardAndNoNTReferences

* LorePassOver

* ArmourNerf

* MergeConflicts

* MergeConflict

* MergeConflict

* SlightRework

* Terran

* IronHawk
2017-05-28 10:30:17 -04:00
Robustin
9ceada6c66 Sleeper Icon 2017-05-24 12:34:38 -04:00
Robustin
b0e081db2f Update ammo_casings.dm 2017-05-24 12:17:54 -04:00
Robustin
725f669726 Gang Sniper 2017-05-23 19:50:24 -04:00
kevinz000
380ea858fe fixes chameleon laser guns blowing up welding tanks for real this time (#27443) 2017-05-20 23:22:26 -03:00
Steelpoint
8b2189aa74 Tactical Energy Gun/ERT Sec Officer Change (#27387) 2017-05-20 01:54:06 -03:00
swindly
8010794724 Adds modified syringe guns (#27276) 2017-05-19 08:24:37 -03:00
Joan Lung
1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
kevinz000
96b842d120 Update energy.dm 2017-05-04 22:18:37 -07:00
Lularian
36f0916b44 SWAT teams use LMGs right? 2017-04-26 02:43:57 -05:00
kevinz000
4677de4064 Update energy.dm (#24875) 2017-03-10 23:04:44 +01:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
kevinz000
ceb65bd66b [READY]Chameleon gun projectile disguising (#24574)
* this'll end well

* hmm

* double hmm

* prevents emp crash

* why am i getting things wrong reee

* done

* .
2017-03-08 21:56:25 +01:00
MrPerson
9dd81f1da8 Puts files in single quotes like they belong
This means they're included into the rsc and sent out althogh almost all of these files were already included elsewhere. Also DM will yell if the file couldn't be found for whatever reason like if someone moves or renames it.

I left out some file types for various reasons
dmis used in overlays: I have another pr I'll do later which will fix all of them and I don't want to conflict with myself
text files: they would get included in the rsc, which is completely unnecessary. However they're small, so they might be worth including anyway
2017-02-12 07:15:18 -08:00
kevinz000
0ced9342b9 [READY]Aimable wizard lightning bolts (#23723)
* ZAP!

* YOU DID NOT SEE THAT

* YOU DI NOT SEE THAT 2

* object orientated pr

* gdi

* protection

* object orientated pr v2

* REEEE

* blacklists

* Update magicarp.dm
2017-02-08 18:31:52 +13:00
Cyberboss
3f7f5d4000 Removes/Refactors /mob/unEquip (#22918)
* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
2017-01-31 09:28:31 +13:00
Firecage
50bbf5aa50 Allows syringes and droppers to show their reagents when examined while wearing things such as Science Goggles. (#22618)
* Allows syringes and droppers to show their reagents when examined.

* rearranges my logic

* replaces SEMIOPENCONTAINER with TRANSPARENT

* Silly spelling error fix.

* Moves the defines from flags to container_type to avoid issues with conflicting flags

* changes it back to obj/item/O

* Moves the OPENCONTAINER and TRANSPARENT defines to the reagents.dm
2017-01-04 20:00:46 +13:00
Mervill
01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
Razharas
364964b5d5 Merge pull request #21818 from Thunder12345/tankplsgo
Added Anti-armour Launcher
2016-11-30 18:13:47 +04:00
Thunder12345
cfd947f02c Reeeeeee 2016-11-30 14:08:26 +00:00
Mervill
b5578df27d corrects some defs without leading slash (#21843) 2016-11-30 20:05:14 +13:00
Thunder12345
8959238828 Antitank Launcher 2016-11-28 16:46:30 +00:00
Joan Lung
78e03d4386 Merge pull request #21534 from lzimann/summonlesserspell
Adds the spell Arcane Barrage to wizards
2016-11-14 14:48:04 -05:00
uraniummeltdown
3bd538a1b3 Adds raw TC to uplink and 10mm ammo variants (#21498)
* adds raw telecrystals to uplink, can be used to refill uplinks and uplink implants, adds 10mm variants to uplink for traitors and nuke ops

* grammar
2016-11-14 19:02:40 +13:00
Lzimann
9d23e5ab3c Changes the Lesser Summon guns to Arcane barrage. 2016-11-13 17:30:42 -02:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
Xhuis
b22cc0543a [s] Adds new Halloween content (#21191)
* Adds new Halloween content

* Removes the delay

* Replaces archaic code

* Atomizes by removing unrelated tweaks

* Conflicts I

* Conflicts III, I think

* Unticks "halloween.dm"
2016-10-29 11:28:11 +13:00
phil235
1ea0e47aa4 Visible_message() when being attacked by melee or projectile is replaced by a simple message only to the target instead of all viewers.
The message when firing a gun is removed.
To keep things balanced melee attacks (punches, alien attacks, animal attacks, etc...) now show a visual effect (similar to what we current have with item attacks.
Fixes muzzle flash effect not appearing for mech guns.
Fixes muzzle flash effect not appearing for certain ranged animal.
Fixes the item attack effect not being visible to camera viewers and mech occupants.
Fixes toy guns foam dart not dropping on the ground when shooting a mob on the same tile as us.
Fixes toy smg magazine sprite being invisible sometimes.
Fixes foam dart not facing the correct direction when fired.
Changes the bullet projectile sprite to have a slight tracer effect so as to be more visible.
2016-10-13 19:21:30 +02:00
kevinz000
125209cfd4 stuffs (#20633) 2016-09-26 14:55:12 +13:00
phil235
9124c65198 Adds some visual effects when ammo casings are fired and when projectiles hit things. 2016-09-14 02:57:47 +02:00
KorPhaeron
100275b85f Kinetic Accelerator Overhaul 2016-08-13 18:06:28 -05:00
KorPhaeron
9ee67f942a Projectile Dismemberment and Wizard spellblade (#19783)
* Spellblade

* Plasma cutters and onback sprites

* Cleans up dismemberment projectile code

* Runtime fix
2016-08-11 15:43:29 +12:00
MMMiracles
69c676617b Making Space Great Again (implying it ever was): Part Uno (#19085)
Adds space ruins. Balance not included.
Simple mob ghosts actually work now.
Puzzle1 ruin removed due to issues with projectiles.
2016-07-05 00:02:42 +12:00
kevinz000
d3f25c53f3 Gravgun Tweaks (#18504)
R&D lathe cost slightly upped
Added new "chaos" mode which randomly tosses shit around ("""randomly""")
NEW INHAND SPRITES ARE IN
FIXED THE BUG THAT LEAD TO INFINITE RECURSION AND CRASHED MC
2016-06-14 12:25:56 +12:00
phil235
3b8af6f5ff Fixes grille/New() not calling ..()
Blood drips icons are now in blood.dmi instead of drip.dmi (which only had the 5 drip sprites).
Moved projectiles, guns, casings and ammo boxes to be in the right files. Please don't put your gun with its projectile, ammo casing and ammo box all the same file.
I split growing.dmi into 5 smaller files so we don't get close to the 512 icon limit again. Each seed has a var to indicate which icon file to use when planted.
Fixes code for heavy pulse laser projectile to be less awful.
2016-06-11 23:18:26 +02:00
kevinz000
e8ddb7a4d7 why the fuck 2016-06-04 02:44:25 -07:00
kevinz000
8b79a21698 why 2016-06-04 02:39:38 -07:00
kevinz000
607c4be5f9 hjope this works 2016-06-04 02:38:07 -07:00
kevinz000
4b2077fd6b fortheloveofallthatisholyworkplease 2016-06-04 02:30:38 -07:00
oranges
24056f9df3 Merge pull request #18146 from pudl/angela
Fixes smg magazines icon
2016-06-03 09:10:04 +12:00
pudl
74a5ff30ad Another one bites the dust 2016-06-01 20:04:46 -05:00
oranges
5cbce38a55 Removes peacekeeper bola snare 2016-05-31 23:21:18 +00:00