cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,177 Commits 61 Branches 14 Tags
71efbeef26d4d045bec29d212cdef6eae1f00e4e
Commit Graph

2115 Commits

Author SHA1 Message Date
hornygranny
4ff8507c85 Merge pull request #5727 from phil235/RecorderFix 
Fixes the tape recorder. (one typo)
 2014-11-08 15:07:47 -08:00
Cheridan
53bf024dbe Merge pull request #5545 from RemieRichards/DiseaseRework 
Disease Code Partial Rework
 2014-11-08 00:17:47 -06:00
Cheridan
15b16e1f67 Merge pull request #5726 from paprka/traitorbeltthing 
Adds disguised med analyzer to medibelts
 2014-11-07 23:39:56 -06:00
hornygranny
efb3877fcf Merge pull request #5682 from paprka/fixdefib 
Defibrillator Hotfixes
 2014-11-07 19:49:04 -08:00
Remie Richards
2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
 2014-11-08 01:07:29 +00:00
paprka
7bde69c3a7 emagged defibs now make people gasp 2014-11-07 16:17:58 -08:00
paprka
774e82de06 Buffed weaken of safety off defibs and removed burn damage 2014-11-07 16:17:11 -08:00
Cheridan
594fd9d3e2 Merge pull request #5271 from Menshin/html_sanitization 
Text input sanitization (take 1)
 2014-11-07 13:56:20 -06:00
Cheridan
e2bf3eca4b Merge pull request #5705 from Donkie/batonfix 
Fixes #5691 - Batons incorrectly giving messages
 2014-11-07 10:27:09 -06:00
Cheridan
3f16a966b2 Merge pull request #5712 from xxalpha/amilli 
Increases gold content per Robust Gold cigarette to 1
 2014-11-07 10:09:54 -06:00
Cheridan
669a20df77 Merge pull request #5708 from paprka/stupidfuckup 
Fixes utility medipen bundle for miners
 2014-11-07 10:03:46 -06:00
phil235
7ca1c48206 Fix the tape recorder. 2014-11-07 10:52:52 +01:00
paprka
e5db75d756 adds disguised med analyzer to medibelts 2014-11-06 21:36:54 -08:00
xxalpha
e1a06faa9b Increases gold content per Robust Gold cigarette to 1 2014-11-06 18:23:48 +00:00
paprka
b99499e277 fixes utility medipen bundle for miners 2014-11-05 18:02:14 -08:00
Daniel
059244387f Fixed #5691 2014-11-06 01:12:15 +01:00
JJRcop
bfc62a78aa Changes the defibrillator to use HEALTH_THRESHOLD_DEAD as the max damage it heals 
Changes succumb to apply exactly the required amount of oxyloss to die, instead of a hard-coded 200
 2014-11-04 23:48:57 -05:00
paprka
ff78a43bb7 fixes basically everything wrong with defibs right now 2014-11-04 19:33:41 -08:00
tkdrg
a0b61707a4 NTRC (PDA chatrooms) bugfixes 
Removed operator, revamped structure, fixed a lot of bugs

Adds myself to admins.txt
 2014-11-04 22:47:48 -03:00
paprka
6efb62989f fixes defibs reviving and noclone check 2014-11-04 15:01:22 -08:00
Menshin
b77e2fc46a Conflicts solving 2014-11-04 20:24:52 +01:00
hornygranny
b8f0ef4efe Merge pull request #5541 from xxalpha/cigarettes 
New Cigarette Packs
 2014-11-03 18:49:29 -08:00
hornygranny
05539c7d13 Merge pull request #5382 from TZK13/Asteroid-Toy 
Adds new meteor toys and space carp plushies to arcade machines
 2014-11-03 18:39:16 -08:00
hornygranny
e662932bd1 Merge pull request #5512 from RemieRichards/AcidBurns 
Acid Rework
 2014-11-03 18:11:49 -08:00
paprka
1b6eb8afec Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-11-03 17:57:40 -08:00
hornygranny
de22ca7aac Merge pull request #5354 from optimumtact/patch-1 
Remove click delay from pipe painter and adds adjacency check
 2014-11-03 17:44:29 -08:00
hornygranny
d81eb696c4 Merge pull request #5570 from xxalpha/noslipfloor 
High-traction Floor
 2014-11-03 17:37:20 -08:00
hornygranny
bf9679d6cb Merge pull request #5581 from tkdrg/spacefactory13 
Constructable conveyor belts!
 2014-11-03 17:33:32 -08:00
hornygranny
8b4ab665cb Merge pull request #5490 from tkdrg/hiasl 
Nanotransen Relay Chat
 2014-11-03 17:26:53 -08:00
hornygranny
7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings 
Soap, lube, and janitor tweaks
 2014-11-03 17:19:37 -08:00
hornygranny
6e11157661 Merge pull request #5520 from paprka/minerscrubs 
Improves mining equipment prices, rebalances medipens
 2014-11-03 17:12:02 -08:00
hornygranny
0a0cd991de Merge pull request #5516 from paprka/telestunfix 
fixes telebaton stunning borgs
 2014-11-03 17:11:39 -08:00
Remie Richards
c1060d95b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns 
Conflicts:
	code/game/atoms.dm
	code/game/objects/items.dm
 2014-11-03 19:38:58 +00:00
Cheridan
51eae4c5a2 Merge pull request #5601 from phil235/ObjVerbCheckFix 
Adding checks for stun, restrained to many object verbs.
 2014-11-02 11:34:48 -06:00
Cheridan
71fe1bf00b Merge pull request #5597 from phil235/IdMsgFix 
Fix the 'show ID' message.
 2014-11-02 11:10:16 -06:00
Cheridan
4f58312d76 Merge pull request #5596 from phil235/LipstickFix 
Fix for #5588
 2014-11-02 10:39:21 -06:00
Cheridan
ef29aaef57 Merge pull request #5598 from phil235/PDAsoundFix 
Fix lack of sound when non-silent PDA receives a message.
 2014-11-02 10:26:28 -06:00
tkdrg
30841b5f37 Merge remote-tracking branch 'upstream/master' into hiasl 
Conflicts:
	code/modules/research/message_server.dm
 2014-11-01 20:04:26 -03:00
paprka
97a89b1162 Stun proc punctuation and compile error fix 2014-11-01 11:32:50 -07:00
paprka
17ea3d8641 adds stun to emagged defib 2014-11-01 11:28:51 -07:00
paprka
52d99e64ca noclone check 2014-11-01 11:23:51 -07:00
paprka
6acd73c835 changes emagging, punctuation, and emag stun 2014-11-01 11:20:05 -07:00
phil235
128c9222e5 Adding checks for stun, restrained to many object verbs. 
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
 2014-11-01 19:18:01 +01:00
phil235
4803f099f6 Fix lack of sound when non-silent PDA receive message. 2014-11-01 15:32:48 +01:00
phil235
c8f3ad2dd0 Fix ID show message. 
Remove "Read ID card" object verb (because all the information it gave was already in the ID card's name.
Remove some old text( ) stuff.
 2014-11-01 15:17:43 +01:00
phil235
af767f2935 Fix being able to apply lipstick through masks and items covering the mouth. 2014-11-01 13:28:32 +01:00
Remie Richards
0bc683aa29 Merge pull request #5457 from GunHog/AI_Radio 
Adds AI Integrated Radio
 2014-11-01 03:44:44 +00:00
paprka
df289b5c53 Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-10-31 10:28:57 -07:00
paprka
389e0e1237 research design and origintech update 2014-10-30 19:21:58 -07:00
xxalpha
b9f5947f5e High-traction Floor 2014-10-31 01:50:31 +00:00