Commit Graph

42 Commits

Author SHA1 Message Date
ShizCalev
ee17c0cb19 Cleanup & corrections 2018-06-28 21:27:32 +02:00
Nich
6c879778b6 spellchecks tg whatever 2018-06-28 21:26:38 +02:00
CitrusGender
a64e1c2d29 Fixes null bullets from being fired after they're deleted (#38437)
* Adds handle_atom_del check to if deleted bullets are equal to ammo type and chambered round.

* works for me

* Update _box_magazine.dm
2018-06-13 10:39:07 +01:00
vuonojenmustaturska
77410bd84b Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 15:48:10 +02:00
Dax Dupont
c374bb8686 Fixes oversight with foam (#37898)
braaap

TRUE FALSE

false false
2018-05-18 14:29:13 +01:00
Tlaltecuhtli
58445ed0f7 fixes some inconsistency in the bulldog shotgun ammo (#37548)
the default bulldog shotgun ammo makes sense now
2018-05-09 22:23:38 +01:00
Dax Dupont
eeb420005d You can no longer print infinite ammunition. (#37626)
* You can no longer print infinite ammunition.

* henk

lazy

anus

Reduces .38

Casings now give a tiny bit of metal so the janitor gets a buff

spacing
2018-05-03 14:44:58 +01:00
Jordan Brown
3c65de23ee Merge pull request #37501 from ShizCalev/icon-fixes
Fixes missing icons
2018-04-28 20:57:06 +01:00
oranges
feca7a7b38 Uppercases slot defines. 2018-04-28 09:49:08 +01:00
kevinz000
f5ae06565c Splits up projectile files (#36018) 2018-03-04 17:10:46 -05:00
vuonojenmustaturska
ca6c21851a adds abstract_1 flag to internal magazine objects 2017-12-22 23:24:32 +02:00
Emmett Gaines
25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
vuonojenmustaturska
5233ec1f6a Finishes the forceMove port (#33519)
* a thing

* thingy 2: electric boogaloo

* Obligatory webeditor commit
2017-12-15 10:39:34 +13:00
Emmett Gaines
7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom
2817a1737b defines math 2017-11-22 17:36:58 -05:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
FrozenGuy5
5294c48be1 Adds alot more initialize() part two 2017-11-12 10:56:33 +00: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
Kerbin-Fiber
91a9164062 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter (#30531)
* Automatic changelog generation for PR #30416 [ci skip]

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Automatic changelog generation for PR #30416 [ci skip]

* Delete AutoChangeLog-pr-30416.yml

* Removes riot foam darts from the Donksoft Toy Vendor, however the Syndicate Donksoft Toy Vendor still has riot foam darts.

* Kek

* Changes magazine paths for he Vendors so the Station made one has no riot foam darts at all meanwhile the Syndicate one still has everything just how it is.

* Hopefully fixes this.

* Reee

* Another Fix

* Another Fix, while I'm at it

* My Changelog

* Minor Fixes

* Grammar Fix
2017-09-10 18:42:16 +10:00
pubby
65bb0a3e32 Ammo cleanup (#30361)
* Clean up ammo

* Fix maps

* Cyberboss ammo cleanup fixes
2017-09-07 11:02:44 -04:00
Joan Lung
36d70f3114 Removes bows 2017-07-26 18:39:57 -04: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
143e3fe2f4 Merge branch 'master' of https://github.com/tgstation/-tg-station into GangBangTest
# Conflicts:
#	icons/obj/ammo.dmi
2017-05-25 14:35:25 -04:00
Robustin
5097c5ab9a Update external_mag.dm 2017-05-24 12:24:13 -04:00
Robustin
df722ce8d7 Update external_mag.dm 2017-05-24 12:23:23 -04:00
Steelpoint
836a81a85d Sketchin Alt Magazine Sprites (#27556)
* InitialCommit

* StraightStripes

* Vertical
2017-05-23 23:13:38 -06:00
Robustin
725f669726 Gang Sniper 2017-05-23 19:50:24 -04:00
Steelpoint
8c0a509bf4 Auto Rifle Alt Mag Sprites (#27463) 2017-05-23 00:15:22 -03:00
Robustin
eb7f2ddc99 Merge branch 'master' of https://github.com/tgstation/tgstation into GG3
# Conflicts:
#	icons/obj/guns/projectile.dmi
2017-05-21 17:54:44 -04:00
Steelpoint
7103172e0b Warden Compact Combat Shotgun (#27427)
* InitalCommit

* InitialCommit

* Removal

* CloseEncounters
2017-05-21 13:44:03 -04:00
Robustin
889eefdca5 more gang guns 2017-05-12 16:04:44 -04:00
Lularian
36f0916b44 SWAT teams use LMGs right? 2017-04-26 02:43:57 -05:00
Mervill
1b353d3cc4 Fixes russian revolver ammo displaying incorrectly (#22253)
* clean up the russian revolver code

* woops
2016-12-18 19:57:26 +13:00
Kyle Spier-Swenson
dedb16826e Speeds up world init. (93s -> 49s) (#21992)
* Speeds up world init.

* Armor is now new inited for obj and the first level of subpaths.
* Actions is now lazyinited and deleted with empty.
* Actiontypes is now only inited when actually used and deleted once it pre-fills actions with the action buttons.
* Pipes now prefill their node list(s) in new() using new /list/ (count) syntax to speed up the list initaliztions and remove the init proc.
* Pipes no longer store their item version, instead creating it on the fly when deconned
* Walls no longer store their metal stacks, instead creating it on the fly when deconned.
* obj, walls, floor, plating, item, machinery, structure, pipe, pipenet, atom, and movable no longer have an (init) proc. (along with a few other smaller examples)
* Atmos can pass checking is now a var with the ability to have a proc be call in advance cases.
  * (as a side effect, I had to fix a few things that were calling atmosCanPass rather then using the pre-calculated list, this should speed up chemfoam and flame effects greatly)

* Reverts upload limit
(remind me one day to defuck this, it could easily be a config thats not editable by vv to make changes easier)

* Makes apc update icon a bit faster.
APC new is some what high on the profile of world init, still not sure why, but this stood out as a waste of cpu so i fixed it.

* Fixes runtime with atmos backpack water tanks.

* Makes smoothing faster (and fixes turfs smoothing twice at init)

* Makes apcs init faster by replacing some spawns with addtimer

* fix transit turfs.
2016-12-08 21:50:15 +13:00
Razharas
364964b5d5 Merge pull request #21818 from Thunder12345/tankplsgo
Added Anti-armour Launcher
2016-11-30 18:13:47 +04: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