cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 20:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,971 Commits 61 Branches 14 Tags
3fca874ea3ea2026b9c08f784bc11fa715da660d
Commit Graph

3263 Commits

Author SHA1 Message Date
paprka
6db18cff96 initial commit 2014-09-30 13:41:02 -07:00
Cheridan
fa751f2f72 Merge pull request #4975 from phil235/CloneMessages 
Replacing clone damage descriptions with "cellular damage".
 2014-09-30 12:21:42 -05:00
Remie Richards
219864312a Merge pull request #4988 from Miauw62/420 
Fixes a bunch of saycode things.
 2014-09-30 10:23:23 +01:00
Cheridan
7e8e728d85 Merge pull request #4986 from Ikarrus/gangfixes 
Gang Mode fixes and improvements
 2014-09-29 10:33:17 -05:00
Cheridan
0f5fd59c0c Merge pull request #4919 from Miauw62/tatorbalance 
Rebalances traitor items.
 2014-09-27 17:13:50 -05:00
Miauw
f0ddaf7d8e Merge branch 'master' of https://github.com/tgstation/-tg-station into 420 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2014-09-27 16:09:31 +02:00
Miauw
77584d4a7d Fixes a bunch of saycode things. Objs can now hear radio talk. 
Added a proper strip_html() function.
Fixed #4959
 2014-09-27 16:06:06 +02:00
Swag McYolosteinen
d9ee81bb96 Merge pull request #4815 from phil235/AudibleMsgFix 
Simplifying audible messages
 2014-09-27 15:01:56 +02:00
ikarrus
131b5ee0ec - Removes the useless has_been_rev var 
- Reworded intercept report to discourage security from inadvertently causing a gang to win.
- Recaller use is logged
- Made the text explaining membership visibility more visible
 2014-09-26 21:37:07 -06:00
ikarrus
65e38bdfbc Gang Mode fixes and improvements 
The first of many. Most caused by horrible merge-related accidents.
- Gang converts are no longer revolutionaries
- Revolution controls show up in the TP again
- Gang added to game_options.txt defaulting to 0
- Clarified some help text strings
 2014-09-26 19:27:13 -06:00
phil235
231c1f0ea2 Merge branch 'master' of https://github.com/tgstation/-tg-station into CloneMessages 2014-09-25 20:07:29 +02:00
phil235
1d9834b159 Adding changelog and correcting a typo 2014-09-25 20:06:01 +02:00
phil235
1840d72ae4 reverting to show_message proc in three places. 2014-09-25 19:14:51 +02:00
phil235
b00b41bbf9 Replacing clone damage descriptions by "cellular damage". 2014-09-25 19:11:31 +02:00
phil235
3248e23887 Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix 
Conflicts:
	code/modules/recycling/disposal.dm
 2014-09-25 18:45:53 +02:00
phil235
7afbd3345b Replacing some hearers(...) with get_hearers_in_view(...). 
Renaming Make Sound to Object Say.
Switching deaf_message in audible_message proc to last argument.
Replacing some "for(mob in hearers)+show_message" with audible_message()
 2014-09-25 18:22:27 +02:00
ikarrus
796e540dfc Merge branch 'master' of https://github.com/tgstation/-tg-station into ammunitionlocker 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-09-25 09:37:54 -06:00
Cheridan
013a1b1a3f Merge pull request #4918 from Aranclanos/eletropack 
Adds the eletropack to the radio controller objects, so they work again.
 2014-09-25 08:52:00 -05:00
Cheridan
02d3cdc199 Merge pull request #4938 from hornygranny/tableclimbing 
table bugfixes
 2014-09-24 19:09:26 -05:00
Hornygranny
24edf9f6d4 Fixes #4933 by refactoring climbing (ty MrPerson) 2014-09-24 12:31:24 -07:00
Swag McYolosteinen
f9e17faca3 Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire 
Repaths clown ore to bananium
 2014-09-24 16:58:23 +02:00
Swag McYolosteinen
78ce564314 Merge pull request #4871 from phil235/FlashPowderthing 
Fixes #4176
 2014-09-24 16:55:49 +02:00
Remie Richards
a9d609bc9b Merge pull request #4802 from Menshin/stacks_merging_cleaning 
Crafted stacks merging cleaning
 2014-09-24 12:04:07 +01:00
Hornygranny
8aa5fd2ff6 ishuman changed to istype for previously defined scope 2014-09-23 10:43:26 -07:00
Cheridan
ff5ec967eb Merge pull request #4917 from Jordie0608/plastiqueisoldfrechforplasticexplosives 
Standardizes name and path of plastique/plastic explosive/c4 to C4
 2014-09-23 09:02:43 -05:00
Swag McYolosteinen
9fc6fccf17 Merge pull request #4616 from Ikarrus/revvsrev 
Gang Mode for TG
 2014-09-22 20:28:47 +02:00
Miauw
619b7beede Syndie bundle adjustments. Made the emag one TC more expensive. 2014-09-22 18:37:27 +02:00
Hornygranny
4176e6d106 only humans can climb 2014-09-21 21:58:30 -07:00
ikarrus
c4efa0f773 Downgraded ammunition locker to a regular closet 
The armory doesn't need two secure lockers, and certainly not one just to hold beanbag shells.
 2014-09-21 22:02:35 -06:00
ikarrus
eabe1f4491 Resolved conflicts and addressed maintainer feedback. 2014-09-21 15:30:54 -06:00
Cheridan
a4d9d70678 Merge pull request #4910 from Miauw62/blblblblblb 
Fixes radio MMIs turning exofabs into radios.
 2014-09-21 16:20:39 -05:00
Miauw
899d967953 Doubles the amount of TC and the prices of uplink items. 
Stealthy items have been slightly decreased in price.
Weapons have been slightly increased in price.
Nuke items remain mostly unchanged.
 2014-09-21 15:56:24 +02:00
Aranclanos
d156f4770a Adds the eletropack to the radio controller objects, so they work again. 2014-09-21 05:16:02 -03:00
Jordie0608
facb2744cb Standardizes name and path of plastique/plastic explosive/c4 to C4 2014-09-21 17:34:26 +10:00
Cheridan
4616ca7c63 Merge pull request #4764 from hornygranny/tableclimbing 
humans can climb onto tables
 2014-09-20 16:58:20 -05:00
Cheridan
4f5431c136 Merge pull request #4899 from Perakp/conehat 
Wear those warning cones like you always wanted to
 2014-09-20 16:46:38 -05:00
Miauw
e66f74439a Fixes radio MMIs turning exofabs into radios. 
Also removed the obsolete GLOBAL_RADIO_TYPE variable.
 2014-09-20 15:19:29 +02:00
Hornygranny
7f059a82fa changed stun to Stun() :^) 2014-09-19 22:31:54 -07:00
Remie Richards
86bd60aed7 Merge pull request #4874 from xxalpha/master 
Cigarettes box capacity modified to hold rollies and lighers.
 2014-09-19 22:43:59 +01:00
xxalpha
c1449e4827 Cigarette packs can now hold lighters. Now with thought and effort put into it! 2014-09-19 22:22:59 +01:00
Hornygranny
1b9eddc2e4 climbing a table stuns you 2014-09-19 13:32:44 -07:00
Perakp
3f451f9b1b Warning cones can be worn on your head, with original codersprites. 2014-09-19 22:44:59 +03:00
Remie Richards
6dde12b8ed Merge pull request #4838 from Jordie0608/breakingrillesisagreatwaytoruinabarbeque 
Updates grille damages Fixes #796
 2014-09-19 18:46:14 +01:00
Aranclanos
fb15795f2b Revert "Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them" 2014-09-19 13:38:10 -03:00
ikarrus
7c32420497 Resolved conflicts and added my yml changelog file 2014-09-19 09:30:59 -06:00
Remie Richards
9458d30d3a Merge pull request #4718 from Perakp/wetShower 
Showers wet the floor
 2014-09-19 16:28:04 +01:00
Remie Richards
49bf678e7f Merge pull request #4440 from Ikarrus/antagjobbans_actually_worth_a_damn 
Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them
 2014-09-19 16:00:29 +01:00
Cheridan
7a32582db9 Merge pull request #4745 from Perakp/miningScanner 
Mining scanner scans automatically, similar to t-ray scanner.
 2014-09-19 09:43:32 -05:00
Jordie0608
40e0a52283 Repaths clown ore to bananium 2014-09-19 21:26:50 +10:00
Jordie0608
cbdf479b5d hitsound uses burn else instead of checking brute 2014-09-18 20:05:46 +10:00