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

1875 Commits

Author SHA1 Message Date
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
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
1d9834b159 Adding changelog and correcting a typo 2014-09-25 20:06:01 +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
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
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
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
ikarrus
eabe1f4491 Resolved conflicts and addressed maintainer feedback. 2014-09-21 15:30:54 -06: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
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
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
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
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
xxalpha
a929c42d29 Cigarettes box capacity modified to hold rollies and lighers. 2014-09-18 00:26:43 +01:00
Cheridan
f5bf1ddaa9 Merge pull request #4809 from RemieRichards/Drones 
Ports Drones from NTstation + New Improvements/Features
 2014-09-17 16:56:40 -05:00
phil235
b756450d45 Fixes flash powder only checking for sunglasses protection. 
Simplify the flashbang prime() proc a bit.
 2014-09-17 22:48:02 +02:00
Cheridan
83390797cb Merge pull request #4844 from phil235/TypoFix 
Fixing typos.!
 2014-09-17 10:13:21 -05:00
Cheridan
de6edfc1c6 Merge pull request #4818 from Incoming5643/summoneventfixerspecial 
Magic Mania 1.75 Appendix A: lets get comparitively reasonable
 2014-09-16 09:09:40 -05:00
Cheridan
98ca6f551a Merge pull request #4715 from Firecage/STATUESGALORRE 
Mineral Statues!
 2014-09-16 08:56:40 -05:00
Cheridan
cd990bdeda Merge pull request #4810 from phil235/Messagetypos 
Fix many messages and sounds
 2014-09-16 08:45:31 -05:00
Alex
9673532613 Merge pull request #4796 from Perakp/ghostbag 
Ghosts don't trigger mousetraps.
 2014-09-16 12:18:04 +01:00
Cheridan
d3e7e1b73d Merge pull request #4821 from phil235/FlashbangFix 
Fix for #3773
 2014-09-15 21:27:15 -05:00
Incoming
071f9bff0a Fixes up some silly problems with cursed items: 
Things won't be called cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed foo's anymore

Cursed Katanas can't get stuck in any other slots now

Things that destroy your ability to go into space now won't spawn on you at all if you happen to be in space when the spawning occurers, but hey don't idle in space just to avoid a luchador mask, magicarp are still a thing.
 2014-09-15 19:22:25 -04:00
phil235
8672e58e3a Fixing typos. 2014-09-15 19:50:34 +02:00
Firecage
caa4d60503 Phase Honk 2014-09-15 12:44:52 +02:00
Firecage
16502db223 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into STATUESGALORRE 2014-09-15 11:17:44 +02:00
Firecage
ad5d15a225 New part 2014-09-15 11:16:39 +02:00
Perakp
f637e6491c Unconscious don't trigger mousetraps. 2014-09-14 20:49:36 +03:00
phil235
8d6ee69a36 Fixing issue where people can't hear their own emotes while inside lockers and the audible messages when also in the dark. Removing object_talk() proc (obsolete). 2014-09-14 16:17:16 +02:00
phil235
e639737605 hearers() -> get_hear() Fixing the issue. 2014-09-14 15:35:23 +02:00
Alex
6697b18f7a Merge pull request #4770 from Donkie/glassfix 
Fixed welding a shard producing message spam
 2014-09-14 13:20:24 +01:00
phil235
4d427bf712 Partial fix for the immunity to flashbangs in the dark ( now only immune if in the dark AND inside a locker). Deaf people no longer see the "BANG" message of flashbangs. 2014-09-14 14:19:25 +02:00
Menshin
abda57bc26 Location nulling moved to Destroy() proc 2014-09-14 11:51:02 +02:00