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
16,756 Commits 61 Branches 14 Tags
b0fe1d98181db4e4faeb2270de90665a21093679
Commit Graph

7301 Commits

Author SHA1 Message Date
Steelpoint
b0fe1d9818 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-01-08 02:09:02 +08:00
Swag McYolosteinen
4df0c62695 Merge pull request #6865 from paprka/revert-5646-newhosjumpsuit 
Revert "Adds Nien's HoS formal sprites so they dont look like a Prince s...
 2015-01-07 18:36:46 +01:00
Ergovisavi
e326cbab26 Merge pull request #6797 from sawu-tg/freshfood 
Adds the new "E.X.P.E.R.I-MENTOR" research machine.
 2015-01-07 09:31:31 -08:00
tkdrg
247f60c290 Merge pull request #6866 from Carn/fix_6864 
Resolves #6864 - Sets ticker can_fire=1 inside the start_now verb.
 2015-01-07 14:28:48 -03:00
Sawu
75335fcd08 Fixes missing Category 2015-01-08 04:21:17 +11:00
carnie
4bcc5ec791 Resolves #6864 - Sets ticker can_fire=1 inside the start_now verb. 2015-01-07 17:13:23 +00:00
paprka
88e124e88c Revert "Adds Nien's HoS formal sprites so they dont look like a Prince suit." 2015-01-07 09:12:39 -08:00
Steelpoint
699439cc31 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-01-08 01:12:29 +08:00
Sawu
feb141ca15 Merge branch 'master' of https://github.com/tgstation/-tg-station into freshfood 
Conflicts:
	code/modules/research/designs/machine_designs.dm
 2015-01-08 03:58:31 +11:00
Miauw
2a71a8ee12 Merge branch 'master' of https://github.com/tgstation/-tg-station into newhosjumpsuit 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/under/jobs/security.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	icons/mob/head.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/uniforms.dmi
 2015-01-07 14:59:24 +01:00
Steelpoint
e1af9924ca Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 2015-01-07 12:10:11 +08:00
tkdrg
652c8f5741 Merge pull request #6818 from Ergovisavi/more_pod_cloning 
Some replica pod cloning fixes
 2015-01-06 22:53:41 -03:00
Swag McYolosteinen
714cc8c59e Merge pull request #6780 from tkdrg/wooh 
Adds a (follow) link to ghost messages
 2015-01-06 20:58:56 +01:00
tkdrg
67c9b5be21 Changes (Follow) to (F) in the ghost chat 2015-01-06 16:28:24 -03:00
Sawu
01dedd5ea2 Merge branch 'freshfood' of https://github.com/sawu-tg/-tg-station into freshfood 2015-01-07 04:39:30 +11:00
Sawu
fba1ccd697 Quickfixes 
*Fixes missing recipe for experimentor
*Fixes the experimentor having the wrong board inside it.
 2015-01-07 04:38:49 +11:00
Steelpoint
5f77b95b23 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 2015-01-07 01:38:38 +08:00
Sawu
ada8b7f23f Fixes a rogue : 
Makes him . instead.
 2015-01-07 04:25:16 +11:00
Sawu
ad4204e43f Fixed Grammar error 
sawu-tg has fixed the error!.
 2015-01-07 04:04:59 +11:00
Sawu
ccce11fa6e Nerfed the Gas reaction majorly. 
*Now uses beepskysmash instead of pacid.
 2015-01-07 03:30:54 +11:00
Sawu
906ab53921 Quickfix to conform with the rewrite. 2015-01-07 01:51:39 +11:00
Sawu
8fcd55bd4d Merge branch 'master' of https://github.com/tgstation/-tg-station into interactive 2015-01-07 01:43:44 +11:00
Remie Richards
f918815bea Merge pull request #6741 from tkdrg/atmoslog 
Adds atmos investigate_log
 2015-01-06 07:56:17 +00:00
Remie Richards
76897893bd Merge pull request #6642 from tkdrg/toupper 
Improves Permission Panel security, take 2
 2015-01-06 07:24:03 +00:00
tkdrg
890c6f8ebe Merge pull request #6799 from Xhuis/knife_fix 
Makes the butcher cleaver a normal-sized item
 2015-01-06 03:26:30 -03:00
tkdrg
d7a4da89ca Merge pull request #6786 from TedStudley/ntsl-update 
Updates/fixes to NTSL
 2015-01-06 01:43:01 -03:00
Steelpoint
6a3131200c Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 2015-01-06 12:24:59 +08:00
tkdrg
1716a82400 Merge pull request #6794 from psykzz/patch-4 
Cell() Update
 2015-01-06 01:22:30 -03:00
Steelpoint
ec821c33d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	_maps/map_files/generic/z2.dmm
	code/_globalvars/lists/mapping.dm
 2015-01-06 12:17:29 +08:00
Xhuis
8f42d43b04 Merge remote-tracking branch 'remotes/upstream/master' into knife_fix 2015-01-05 21:35:05 -05:00
Sawu
d091119545 Ergo's Changes 
*Examine shows NPCs a unique message
*NPCs should no longer stand and stare at people in combat.
*Toned down the amount of rudeness in their speech.
 2015-01-06 13:23:58 +11:00
Xhuis
a5c9a7292f Makes butcher's cleaver a child of kitchen knife 2015-01-05 17:23:03 -05:00
carnie
281df385a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 2015-01-05 19:52:03 +00:00
carnie
a730649167 Fixes breathing (indentation error) 
Fixes atmos machinery (old global list snuck back into code)
 2015-01-05 19:44:17 +00:00
Steelpoint
082f62bf3d NameTweaking+VisibleLoyaltyImplant+MovingSecOfficersSecHUDToObviousLocation 2015-01-06 02:57:05 +08:00
Ergovisavi
7a83165f2b Merge pull request #6773 from phil235/ShadeBuckleFix 
Fixes simple animals not being able to unbuckle themselves.
 2015-01-05 10:45:13 -08:00
Ergovisavi
1cd8dd90b7 Fixing an issue that would prevent pod cloning from working if the mob leaves its body before blood is drawn 2015-01-05 06:25:48 -08:00
Steelpoint
3e37a8e562 MissedANumber 2015-01-05 20:23:05 +08:00
Steelpoint
49ea9b0543 EmergencyResponseTeam-AntagSelectionForAdmins 2015-01-05 20:20:11 +08:00
Sawu
9a20d1cb09 Adds the new "E.X.P.E.R.I-MENTOR" research machine, an alternate research option. 
*Built with 1 scanning module, 2 manipulators and 2 micro lasers.
*Manipulators affect the reset speed, lasers affect it's chance to have bad things happen.
*Heavily RNG based to be the "fun" alternative.
*Includes features such as causing spacial distortions, transforming things into other things, and setting your face on fire.
*Can be built, but currently not included on the map.

The process of the EXPERI-MENTOR works as such:
1. Build it/walk up to it and click the "Scan for R&D Console" button if it is there.
2. Insert anything, literally anything.
3. The user uses a process of elimination to guess what the correct use for the item is ("Poke", "Irradiate", "Gas", "Heat", "Cold" or "Obliterate")
4. A correct guess results in addition of research points and (potentially) a randomised thing happening (reduced with upgrades). A failed results in a fluff message.

Current "use" RND events are:
Poke
*Destroy item, hit mobs in oview(1) for 15 brute
*Destroy item, proceeding to Obliterate
*Eject the item, throwing it at a random target in oview(7)
Irradiate
*Destroy item, apply 25 IRRADIATE to oview(1)
*In oview(1), spawn goo in oview(1)
*Transform item into something from valid_items list and eject it (primes grenades first)
Gas
*Destroy item, spawn toxic gas cloud
*Spawn harmless gas cloud
*Destroy item, Empulse(8,10)
Heat
*Destroy item, explosion(-1,0,0,0,0,flame_range = 2) (sets a small fire)
*Destroy item, heat up turf
*Eject item, spawn smoke, hit mobs for 5 burn in oview(1)
Cold
*Destroy item, release frostoil smoke
*Destroy item, cool down turf
*Eject item, spawn smoke
Obliterate
(by default, this will transfer m_amount and g_amount to a linked lathe)
(I'm aware that both of these are kind of "one item at a time", but I like the effect and left it that way)
*Destroy item, pull all mobs and items in oview(7) towards src
*Destroy item, throw all mob and items in oview(7) at other mobs and items
 2015-01-05 04:53:51 +11:00
Matt Smith
249e19b935 Cell() Update 
Was being output straight to the user, it looked like that might cause the order to be wrong.
Doing this because it looks like the intended results.
 2015-01-04 15:11:52 +00:00
phil235
8f53dcbfb0 Merge pull request #6770 from Menshin/cryptobiolin_process_fix 
Fixes cryptobiolin quantity never diminishing in a mob
 2015-01-04 15:10:58 +01:00
Remie Richards
ed1375d454 Fixes Humanize and Monkeyize producing invisible changelings and never deleting their Animation overlay. 2015-01-04 11:03:10 +00:00
Sawu
47dd60e7bf Changes to the Chatter module. 
*NPCs now use pick_list to draw their speech from strings/npc_chatter.txt
 2015-01-04 16:37:59 +11:00
Remie Richards
3a10a3b198 Merge pull request #6427 from paprka/janitorbuffholyfuckvalvepleasenerf 
Adds dirt overlays for walking on simulated turfs
 2015-01-04 02:22:50 +00:00
carnie
a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2015-01-04 01:52:14 +00:00
carnie
e285bd0b3c Map Update 2015-01-04 01:45:02 +00:00
TedStudley
777a2800a3 Updates/fixes to NTSL 
- Fixed NTSL division
  - Added new NTSL math functions
  - Added changelog information
 2015-01-03 17:43:43 -08:00
tkdrg
b94fcf06b3 Merge pull request #6756 from phil235/VinesDescFix 
Makes mutated vines description more explicit about the mutation type
 2015-01-03 20:04:43 -03:00
tkdrg
a411154581 Merge pull request #6755 from phil235/SpritesFixes 
Three sprite related fixes
 2015-01-03 19:20:00 -03:00