Commit Graph

841 Commits

Author SHA1 Message Date
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
Joan Lung
a596fc442a Merge pull request #27611 from Robustin/GangBang
Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value
2017-05-27 10:26:53 -04:00
Leo
ab1999e026 Merge pull request #27681 from Cyberboss/GunInit
Ports guns to Initialize
2017-05-26 21:05:55 -03:00
kevinz000
d536bf6caf [READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too (#27416)
* hm

* separation part 1

* fixes and more fixes

* gunlight minirefactor

* refactor

* done
2017-05-26 10:37:10 +02:00
Cyberboss
7a4f640eec Ports guns to Initialize 2017-05-25 19:51:08 -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
oranges
0bec7a8150 Merge pull request #27535 from Steelpoint/Sounds
Ballistic Weapon/Shotgun Reload Sounds
2017-05-24 22:51:48 +12:00
Steelpoint
a61827d756 Tactical Energy Gun Unique Sprites (#27557)
* InitialCommit

* InitialCommit
2017-05-23 23:12:50 -06:00
Robustin
725f669726 Gang Sniper 2017-05-23 19:50:24 -04:00
Steelpoint
f1b05d8913 ForgotToRemoveThis 2017-05-23 22:36:15 +08:00
Steelpoint
916e52dde0 MoreSounds! 2017-05-23 22:32:16 +08:00
Joan Lung
9cdf74fb12 KA Pressure Mods are now a traitor miner item (#27484) 2017-05-22 10:19:16 -03:00
Steelpoint
6e60d8d6ed InitialCommit 2017-05-22 14:50:04 +08: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
Joan Lung
7db5d150de Adds framework for kinetic accelerator projectiles having module-based effects on-hit (#27380)
* Adds framework for kinetic accelerator projectiles having module-based effects on-hit

* hmmmmm

* we have to do some weird calculation but this is... sort of easier????????

* missed one
2017-05-21 06:16:31 -04:00
Robustin
44bcd278dd Merge branch 'master' into ganguns 2017-05-20 19:41:52 -04:00
Steelpoint
5e45849c5a Pulse Pistol Recharge Addition (#27426) 2017-05-20 10:39:43 -03:00
Steelpoint
8b2189aa74 Tactical Energy Gun/ERT Sec Officer Change (#27387) 2017-05-20 01:54:06 -03:00
Steelpoint
75d4b25796 Pulse Weapons Sprite Update (#27386) 2017-05-19 15:51:16 -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
Robustin
889eefdca5 more gang guns 2017-05-12 16:04:44 -04:00
Leo
3b9b4e0755 Changes a bunch of hrefs to the proper defines (#26760) 2017-05-02 01:19:51 -06:00
Leo
e803369fd9 Merge pull request #26634 from Core0verload/tochat_master_race
Changes some << to to_chat
2017-04-28 08:14:09 -03:00
Leo
79cdd9fd94 Merge pull request #26603 from Bawhoppen/swatpr6
Changes the naming of an ammo to make it more distinct
2017-04-27 11:17:13 -03:00
c0
ee049b38de Changes some << to to_chat 2017-04-27 04:20:26 +03:00
Cyberboss
729010bbb2 Unorphans the blackbox (#26129)
Moved sql_poll_population from server_maint to this new SS. Moved few remaining server_maint tasks to SSping and deleted it.
2017-04-27 10:04:57 +12:00
Lularian
36f0916b44 SWAT teams use LMGs right? 2017-04-26 02:43:57 -05:00
MrPerson
ff3f84ab81 Replaces /image with /mutable_appearance, where appropriate (#26518)
In cases where you're creating an image to use as an overlay, it makes more sense to use a mutable_appearance if you can. The image will create a static appearance for not just the image but also each intermediate step if you change vars along the way. The mutable appearance avoids this unnecessary and expensive process. The only situation that requires an image instead of a mutable_appearance is if the overlay is supposed to be directional. MA's ignore direction while images don't. I dunno why, probably another BYOND-ism.

I added a convenience function, mutable_appearance(), designed to emulate image(). Also went ahead and set the default plane of /mutable_appearance to FLOAT_PLANE because it's fucking 0 by default.

Several overlays that were image() calls were changed to just text strings when I could. overlays += "string" has the same result as overlays += image(icon, "string") and saves a proc call.
2017-04-25 12:15:16 +02:00
Joan Lung
dc0e007a23 A bunch of Initialize()s now have return values (#26464) 2017-04-25 10:51:40 +02:00
Cheridan
5476503717 Merge pull request #26388 from QualityVan/armlasers
Fixes armlasers breaking on retract
2017-04-20 20:38:52 -05:00
QualityVan
f23a31edfa Fixes loading ammo for the L6-SAW (#26370) 2017-04-20 15:31:02 -04:00
QualityVan
3f646d9564 Fixes armlasers breaking on retract 2017-04-19 19:12:56 -04:00
oranges
ec0f7a6859 Merge pull request #26298 from MrStonedOne/patch-347
Revert unrelated change from #24878
2017-04-19 11:04:47 +12:00
QualityVan
9c114b993b Adds suppression to the foam pistol, smg, and c20r (#26288) 2017-04-17 18:43:47 -04:00
oranges
3802aac356 Slight shotgun tweak to lose a spawn (#26296) 2017-04-17 18:43:01 -04:00
Kyle Spier-Swenson
a6abd2b911 Revert unrelated change from #24878 2017-04-17 02:59:07 -07:00
Cyberboss
9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
XDTM
a48bf2993d Fixes some chameleon clothing not appearing in the list (#25551)
* Fixes some chameleon clothing not appearing in the list

* bio suit (1) => bio suit (bio_suit_janitor)
2017-03-31 08:24:21 +02:00
uraniummeltdown
73836349c8 Changes cost of KA Range Mod to 25 (#25234) 2017-03-19 14:36:50 -03:00
Cyberboss
8ac4aaf115 Guess what? Qdel hint! (#25117) 2017-03-14 20:40:35 -04:00
WJohn
74456fb496 Merge pull request #25025 from JStheguy/master
Fixes 2 missing sprite errors, changes 2 vending machines to match current vending machine designs.
2017-03-13 15:37:49 -04:00
coiax
f1d1e6f5e9 Demotes HANDSLOW to secondary flag (#24878)
It's used in literally four places, it doesn't need a high speed
bitflag slot.
2017-03-13 21:59:48 +13:00
JStheguy
e7ebbe4b0f updates some sprites
ian blanket has neck sprites now
liberation station has new sprites
robotics vendor has new sprites
meteor gun has sprite
2017-03-12 10:16:27 -05:00
WJohn
63bb7060d7 Merge pull request #24933 from JStheguy/deagledrudgery
Desert Eagle Sprite Change
2017-03-11 13:41:30 -05:00
JStheguy
5742c7262f Resprites Deagles
Now with 50% more outline!
2017-03-10 05:31:51 -06:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Lzimann
e58ee1724f Refactors logging into a single var for all mobs and adds a wrapper for proper logging. 2017-03-04 13:32:35 -03:00
Robustin
4c8bfd88f7 Minebots now check for pressure (#24604)
* Minebots now check for pressure

* Woops
2017-03-03 09:36:27 +01:00