Commit Graph

2567 Commits

Author SHA1 Message Date
Remie Richards
f7730eeaef Merge pull request #7087 from paprka/readdjanikart
Improves janicart and adds secway
2015-01-26 00:31:30 +00:00
Swag McYolosteinen
39a9283592 Merge pull request #7329 from Deantwo/PencodeAftermath
Pencode aftermath changes
2015-01-25 18:40:35 +01:00
Deantwo
0e8156814f Font Define'ers Renamed
- Renamed font define'ers.
- Removed font duplicate define'ers.
2015-01-24 17:32:17 +01:00
Swag McYolosteinen
50e927ea33 Merge pull request #7314 from paprka/holster
fixes holster weight class
2015-01-24 16:48:05 +01:00
Deantwo
bfea67611e Pencode Changes Cleanup
- Moved the "parsepencode" proc from **newscaster.dm** and **PDA.dm** to
**text.dm** as a global proc.
- Made the "parsepencode" proc accept only a single agrument if desired.
- Removed the font constants from **newscaster.dm**, **PDA.dm**,
**paper.dm**, **paperbin.dm**, and **photocopier.dm**.
- Replaced aforementioned constants with define'ers in **misc.dm**.
2015-01-24 16:07:13 +01:00
Swag McYolosteinen
af15be9bee Merge pull request #7287 from Deantwo/PencodePdaNotekeeper
PDA Notekeeper 2.2
2015-01-24 14:15:27 +01:00
Swag McYolosteinen
d26e40a6ee Merge pull request #7282 from Firecage/SkinningMonkeysXenos
Adds the ability to remove monkey/xeno skins and make costumes with them
2015-01-24 14:06:13 +01:00
paprka
279c2709d4 Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-24 01:40:51 -08:00
Cheridan
8dfaed5fe4 Merge pull request #6871 from fleure/syndiebux
Adds briefcase with cash to uplink
2015-01-23 22:24:50 -06:00
Cheridan
3d9cf1dc81 Merge pull request #7242 from drynwyn/PAYDAY
Payday Guns Bundle (Adds gloves, clown mask, suit to the guns syndicate bundle)
2015-01-23 21:52:46 -06:00
Cheridan
1428a5a16d Merge pull request #7290 from Iamgoofball/goonchem_shoehorn_backup
Fixes the font issues, removes 3 mutations R.I.P
2015-01-23 21:39:42 -06:00
tkdrg
cb55d4533d Merge pull request #7179 from Firecage/Violin_hit
Adds sound effect to hitting with violin.
2015-01-23 22:15:13 -03:00
paprka
30348d8cdd Merge branch 'master' of https://github.com/tgstation/-tg-station into holster
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
2015-01-23 16:48:30 -08:00
paprka
f487b70b65 fixes holster weight class 2015-01-23 16:47:00 -08:00
Swag McYolosteinen
6094240b5a Merge pull request #7246 from dannno/dufflebags
Fannypacks and Dufflebags
2015-01-23 20:06:26 +01:00
Deantwo
1653ca900d Space Ups
I shouldn't have removed that space. Sorry space.

Oh and I jsut proved [xkcd 1296](http://xkcd.com/1296/).
2015-01-23 18:34:29 +01:00
Deantwo
dc17f211f3 Version Numbers Update
- Incremented the messager's version number.
- Added a version number to NTRC.
- Removed "SS13" from NTRC's title.
2015-01-23 18:23:57 +01:00
Swag McYolosteinen
5e55d4e096 Merge pull request #7141 from Firecage/floor_tile_fix
A fix so mineral floor tiles can be reshaped into mineral sheets.
2015-01-23 17:53:49 +01:00
Swag McYolosteinen
fdb0fd330c Merge pull request #7102 from tkdrg/thxobama
Fixes mining borg jetpack
2015-01-23 17:46:40 +01:00
Deantwo
2739dc0eb3 Scanned Image Warning
- Added a little warning so the user knows that some of the text
formatting will change when edited.
2015-01-23 17:20:54 +01:00
Swag McYolosteinen
10ea66cb6b Merge pull request #7164 from Steelpoint/ERTBalanceV1
[BALANCE|FIX]ERT Balance Pass: 1 + Minor Ops Ship Fix
2015-01-23 17:16:33 +01:00
Deantwo
b7a612b90f NTRC Fixes
PDA.dm:
- Set Nick maximum length was 7 when you started with a 8 character
nick. Input maximum length changed to 8 (9).
- Set Nick and Set Channel 's input are not trimmed.
- Set Channel now has it's input's spaces (" ") replaced with
underscores ("_") after trimming.
- Minor changes to NTRC Help.

chatroom.dm:
- All messages that begin with a "/" are now considered commands.
Feedback is given when a bad command is entered.
- Commands now take a fixed number of agruments. Feedback is given when
bad command agruments are entered.
- Added checks to prevent channel names like  "#".
2015-01-23 15:50:48 +01:00
dannno
9fd1c313d0 resolve conflicts 2015-01-23 01:36:58 -05:00
tkdrg
7df272f3d6 Merge pull request #7128 from Jordie0608/timeforanewnew()
Reagent container spawning refactor
2015-01-23 02:38:42 -03:00
tkdrg
abc78fbba1 Merge pull request #7177 from Menshin/disposals_cleaning_part2
Disposals cleaning/fixing part 2
2015-01-23 02:26:30 -03:00
dannno
28bff00e6a removes 2 syndie bags, removes slowdown from syndie bags 2015-01-22 23:49:14 -05:00
Jordie0608
26161659c5 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
2015-01-23 14:11:38 +11:00
Iamgoofball
de12010e31 Fixes the font issues, removes 3 mutations R.I.P 2015-01-22 17:28:13 -08:00
hornygranny
22e96d3377 Merge pull request #7277 from pudl/chemfix
replaces all instances of pacid with facid
2015-01-22 17:06:46 -08:00
Deantwo
396ff5c800 PDA Notekeeper 2.2
Notekeeper:
- Now uses [PenCode](https://tgstation13.org/wiki/Paper_BBCode) rather
than HTML.
- Now uses the same font as paper. Meaning that signature has a
different font, same as paper.
- Editing the notes now uses **stripped_multiline_input** proc.
- Cancelling the input box no longer deletes all the notes.
- Added a horizontal rule between the Edit button and notes section.
- Incremented the Notekeepers version number by 0.1 because of this new
notekeeper update.
- Scanning paper with your PDA now saves most of the content to the var
that is shown as default text in the edit input box.
- Scanning paper now states that it is saved to the notekeeper.
- Can no longer scan blank paper. User is notificed of this.

NTRC Chatroom:
- Set Nick now does not allow "" as a name, and cancelling the input box
doesn't delete the nick.
- Set Channel now has a length limit of 15 rather than 255.
- Message now does not send "" messages, and cancelling the input box
doesn't send a message.
- Added a horizontal rule between the buttons and notes section.

Other:
- Changed the **msg_input** proc to use **stripped_input**.
2015-01-22 23:15:08 +01:00
Steelpoint
d82736a3c3 MoreRefinment 2015-01-23 02:19:17 +08:00
Steelpoint
0a82231f0c AccessRefinement 2015-01-23 01:54:20 +08:00
Swag McYolosteinen
b44956df86 Merge pull request #7191 from paprka/ebowfix
fixes ebow and KA breaking once emp'd
2015-01-22 18:04:08 +01:00
Firecage
2228b443a7 Adds the ability to remove monkey/xeno skins and make costumes with them 2015-01-22 15:17:22 +02:00
Jordie0608
f535abcc06 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
Conflicts:
	code/modules/food&drinks/food/snacks_burgers.dm
	code/modules/food&drinks/food/snacks_cake.dm
	code/modules/food&drinks/food/snacks_pastry.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/syringes.dm
2015-01-22 15:15:17 +11:00
paprka
2afd0f7862 adds key spawning and stuff 2015-01-21 18:39:17 -08:00
pudl
08f8bb3ce8 replaces all instances of pacid with facid 2015-01-21 20:17:23 -06:00
Nienhaus
3733c4ff48 Merge pull request #7230 from paprka/painigga
Adds walterje's pais
2015-01-21 19:51:19 -06:00
Steelpoint
a5c1faafb6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTBalanceV1 2015-01-22 03:24:54 +08:00
tkdrg
11f3717771 Merge pull request #7162 from Firecage/monkey_dexterity_message
Gives the monkey dexterity message to some stuff.
2015-01-21 15:35:29 -03:00
Firecage
a93a1dfe36 usr -> user in monkey dexterity. 2015-01-21 19:57:48 +02:00
Jordie0608
6140a61de7 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
Conflicts:
	code/modules/food&drinks/food/snacks_pastry.dm
2015-01-21 20:25:45 +11:00
tkdrg
13a7d6d61b Merge pull request #7173 from Carn/#6971
Resolves #6971 - non-lighting_subarea areas are now stored in list/sorte...
2015-01-21 05:06:25 -03:00
dannno
a811bba285 adds fanny packs and dufflebags to various lockers 2015-01-21 02:17:22 -05:00
Jordie0608
4a82ff1564 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/syringes.dm
2015-01-21 16:54:40 +11:00
pudl
e78e3e5118 adds reserve tanks of the 4 basic chems, brute medkits, and brute medbots. 2015-01-20 23:16:21 -06:00
drynwyn
19ec40fce8 Update uplink_kits.dm
Adds nitrile gloves, clown mask, and a suit to the Guns bundle
2015-01-21 00:04:59 -05:00
pudl
dd5c7db5ad in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.
12x syringe
10x styptic patch
10x silver sulf patch
4x charcoal bottle
4x epinephrine bottle
4x morphine bottle
4x diphen bottle
3x potassium iodide bottle
5x salglu bottle
3x atropine bottle
6x spaceacillin syringe
10x calomel syringe
10x salbu pill
10x mannitol pill
5x mutadone pill
4x health analyzer
2x crew monitor
CONTRABAND:
all of the same except with 3 bottles of toxin

the two types of wallmed have been combined into one wallmed, which contains all of the above except halved. in instances where the number was odd, the higher of the two numbers was taken.

medical closet has been stocked with a lot of new stuff.
2x beakers
2x droppers
1x medical belt
1x syringe box
1x toxin bottle
2x morphine bottles
3x epi bottles
3x charcoal bottles
1x rxglasses box

this, of course, 3 new pills and 3 new bottles in code so they could be in the nanomed.

gives genetics a bottle of mutadone pills on box and eff3 and puts a public bottle of epinephrine on the medbay desk. adds a single syringe to boxstation's medical storage.

medkits now have some new equipment.

normal
2x styptic patch
2x sulf patch
1x salicyclic pill
1x health analyzer

fire
4x silver sulf patches
1x health analyzer
1x epipen
1x salicyclic pill

toxin is unchanged

oxygen
4x salbu pills
2x epipen
1x health analyzer

all maps and z levels are updated for this.

renames styptic patch to brute patch and silver sulf patch to burn patch. renames charcoal bottle to antitoxin bottle

adds myself to admins.txt
2015-01-20 22:26:13 -06:00
Cheridan
793243763d Merge pull request #7185 from paprka/inhandrefactor
Inhand refactor
2015-01-20 22:16:06 -06:00
Cheridan
8f98597490 Merge pull request #7049 from RemieRichards/PipesAndBuckles
Buckling Refactor + HE Pipe heat based colour
2015-01-20 20:07:18 -06:00