cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 17:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,523 Commits 61 Branches 14 Tags
2920aa3aa95ecb6dec7fd8bbc0b4580e85c3efa5
Commit Graph

4320 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
be925ebd62 adds a check for the buffer upgrade 2015-01-24 01:49:07 -08: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
Razharas
709b6c8a33 Merge pull request #7278 from sawu-tg/expexpanded2 
Changes/Fixes/Features to the Experimentor
 2015-01-24 05:30:19 +03: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
Steelpoint
217809bab6 Merge branch 'master' of https://github.com/tgstation/-tg-station into SecSprtites2015 
Conflicts:
	icons/mob/uniform.dmi
 2015-01-24 01:11:14 +08: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
Swag McYolosteinen
ac8d96af0b Merge pull request #7171 from tkdrg/nicebush 
Fixes ppgrass ausbush having wrong icon_state
 2015-01-23 17:27:14 +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
dannno
28e40fa2be probability for dufflebag spawns in personal lockers. 2015-01-23 01:29:55 -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
Firecage
3836f7a30a Spike skinned == -> >= 2015-01-22 20:13:27 +02:00
Steelpoint
0a82231f0c AccessRefinement 2015-01-23 01:54:20 +08:00
Firecage
b621d94be8 #DEFINES for skinning spike 2015-01-22 19:42:42 +02: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
Steelpoint
e63c805494 FixMissingIonGunFiringPin+LoyaltyPinsForPulseGuns 2015-01-22 16:47:01 +08: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
Sawu
21edbc1f6f Changes/Fixes/Features to the Experimentor 
* Fixes #7224
* Re-fixes #7272
* Adds relics that spawn around the station, can be researched for randomised objects.
* Adds the meteor malfunction.
 2015-01-22 14:01:02 +11:00
paprka
2afd0f7862 adds key spawning and stuff 2015-01-21 18:39:17 -08:00
paprka
d874ca7f5f Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart 2015-01-21 18:28:52 -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
paprka
0f6122ce0e remove copypaste 2015-01-21 16:55:38 -08:00
Steelpoint
a5c1faafb6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTBalanceV1 2015-01-22 03:24:54 +08:00