Commit Graph

194 Commits

Author SHA1 Message Date
ShizCalev 45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04: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
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
bgobandit ed01357edd This month's spelling fix PR (#28502) 2017-06-17 09:35:30 -03:00
ShizCalev 291ed561d4 Clarification on hardsuit variants in traitor uplink (#28299) 2017-06-11 10:28:32 -03:00
Mike Long 8e07021c0d Adds F.R.A.M.E. cartridge (#28113)
* Refactors old PDA virus cart code

* Adds F.R.A.M.E. cartridge

* Adds FRAME to uplink

* FRAME can now be used to push telecrystals to the target.

* Makes cartridges more extensible.

* Fixes compilation

* Fixes exploit involving removing target's TC if used multiple times.

* Removes redundant var, in accordance with convention.

* Things actually work now.  Whoops.
2017-06-10 19:17:33 +02:00
ShizCalev f2d829261a [Typo] Duffel Bag (#28200) 2017-06-08 19:16:20 -03:00
Jordan Brown 5bbbd26739 Merge branch 'master' into goonchatv3 2017-06-07 20:06:46 -04:00
ShizCalev 6e59b20716 Syndicate Uplink - Typos & Grammar mk2 (#28145) 2017-06-07 16:55:18 -03:00
Jordan Brown ccfaf07a5a Merge branch 'goonchatv3' of https://github.com/Cyberboss/tgstation; branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-06 09:18:44 -04:00
oranges 9f61f827f9 gotta go with the fro 2017-06-03 06:13:56 +00:00
oranges 9406993cd9 Revert "Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions"""" (#27995)"
This reverts commit 05b06635f5.
2017-06-03 16:56:49 +12:00
factoryman942 05b06635f5 Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions"""" (#27995) 2017-06-02 23:03:29 -05:00
Joan Lung 467263c2a1 Bad oranges. Stop readding typos.
Bad.
2017-06-02 22:21:40 -04:00
oranges 7d4f0d7ad0 Revert "Revert "Revert "Typos in syndicate uplink descriptions""" 2017-06-03 14:11:32 +12:00
Kyle Spier-Swenson 5bb97ce93f Revert "Revert "Typos in syndicate uplink descriptions"" 2017-06-02 19:10:42 -07:00
oranges 0d6d6761c3 Revert "Typos in syndicate uplink descriptions (#27878)"
This reverts commit c808fa8c66.
2017-06-02 17:10:30 +12:00
ShizCalev c808fa8c66 Typos in syndicate uplink descriptions (#27878)
* typo

fixes #27875

* more typos

* woops, reviewed the context and recorrected.
2017-06-01 21:50:46 -05:00
Jordan Brown 1abfc03f88 Merge branch 'master' into goonchatv3 2017-05-28 16:30:33 -04:00
AnturK ac0ee0f317 Removes poison pen. 2017-05-28 20:16:10 +02:00
Cyberboss c3df0d5e21 Merge upstream 2017-05-26 15:32:55 -04:00
Robustin c7c63c89c9 Removes airlock charge from uplink 2017-05-25 00:00:44 -04:00
Robustin 40f347eedd Moves airlock charge to Nukeops 2017-05-24 00:24:38 -04:00
oranges ea69e7a473 Merge pull request #27458 from KorPhaeron/webbing
Adds webbing
2017-05-23 15:19:59 +12:00
Joan Lung 9cdf74fb12 KA Pressure Mods are now a traitor miner item (#27484) 2017-05-22 10:19:16 -03:00
KorPhaeron 3dc8ba98f0 Adds webbing 2017-05-20 08:33:47 -04:00
swindly 8010794724 Adds modified syringe guns (#27276) 2017-05-19 08:24:37 -03:00
kevinz000 6c0f3433a3 Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC (#27241)
* Update pneumaticCannon.dm

* Update uplink_item.dm
2017-05-18 10:27:51 -06:00
Joan Lung 074727555d Merge pull request #26677 from coiax/codespeak
Codespeak language and manual
2017-05-17 22:04:16 -04:00
Expletive 810bb90b28 Adds a really stupid syndicate bible, with a great sprite by JStheguy (#27192)
Syndicate Tomes have been added to traitor uplinks for 9 TC. They let an agent or an operative provide both weal and woe.
2017-05-16 16:54:00 -03:00
Jack Edge bf8bffcbe0 Codespeak language and manual
🆑 coiax
add: Syndicate agents can purchase a "codespeak manual", that teaches
them a language that sounds like a series of codewords. You can also hit
other people with the manual to teach them. One use per manual.
add: Nuclear operatives have access to a deluxe manual that is more
expensive but has unlimited uses.
/🆑

- DNM until we have language icons
- Syndicate codespeak only displays the language icon if you KNOW the
language, so you cannot tell the difference between someone just
shouting random codewords on the radio, and someone actually using the
language.
- Modifies generate_code_phrase to optionally return a list of words,
rather than a preformatted string.
- Codespeak manuals turn into random books after being used.
2017-05-14 15:55:52 +01:00
Joan Lung 57830b1a4f You can now buy double eswords from the uplink, but you can no longer use two eswords to construct them (#27088) 2017-05-10 09:21:35 -03:00
XDTM 9a02320092 Bluespace Launchpads (#26956) 2017-05-09 16:31:43 -03:00
PKPenguin321 c2bfa07473 Revert "Removes the gang gamemode" (#26915) 2017-05-04 21:19:02 -05:00
oranges 846f31ca52 Merge pull request #26816 from lzimann/badgamemode
Removes the gang gamemode
2017-05-04 23:29:27 +12:00
Lzimann 68771eae4c Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchatv2 2017-05-03 12:28:28 -03:00
KorPhaeron b7864be38a Curator 2017-05-03 08:08:14 -04:00
Lzimann 59eed8f11c Removes the gang gamemode 2017-05-02 14:28:55 -03:00
4dplanner 9856a1d429 Makes surplus crates less likely to contain implants (#26737)
* Makes surplus crates less likely to contain implants

* Style points
2017-05-01 09:38:32 -04:00
Lzimann 53677a7f7f Fixes conflicts 2017-04-28 08:37:13 -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
oranges d95e859e5d Merge pull request #26386 from ChangelingRain/initialnew
New() goes in the trash, we've gotta Initialize()
2017-04-27 10:15:10 +12: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
Lzimann 79d9178adf Fix conflicts 2017-04-25 10:51:49 -03:00
Lzimann 2082a248d9 Bicon conversion 2017-04-24 22:12:01 -03:00
Joan Lung db9d86a39e New() goes in the trash, we've gotta Initialize() 2017-04-19 18:22:26 -04:00
Joan Lung 84886b3f4f Misc logging changes (#26116)
* Misc logging changes

* conniptions
2017-04-12 18:49:32 -06: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
Cyberboss 5646c736c8 Merge upstream 2017-03-30 19:18:59 -04:00