cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 01:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,569 Commits 61 Branches 14 Tags
c227ebefe810bd72bb94ddadd4cdca30aed75c2e
Commit Graph

526 Commits

Author SHA1 Message Date
tkdrg
cdb5066502 Merge pull request #6324 from Razharas/GenShit 
Added datum mutations
 2014-12-31 17:24:15 -03:00
phil235
e476074b32 Merge pull request #6673 from GunHog/FixForTatorAIRadioAndRemovesSpice 
Fixes #6654
 2014-12-31 15:41:17 +01:00
phil235
3ce15f31b0 Merge pull request #6672 from Menshin/flash_emp_runtime_fix 
Fixes flashes runtiming on EMP + flash spamming
 2014-12-31 15:33:20 +01:00
Menshin
34cee3f088 Renamed confusing variable 2014-12-31 13:51:39 +01:00
tkdrg
829ba09986 Merge pull request #6244 from Ergovisavi/halp_medics_griffon_me 
Adds Medical Hologram functionality to Medical Penlight
 2014-12-30 20:52:46 -03:00
Menshin
168b98840f Fixes flashes runtiming on emp_act() 
Fixes flash messages spam (#6631)

Some code cleaning
 2014-12-30 10:50:43 +01:00
Ergovisavi
f3251c7224 Adds a Medical Hologram functionality to the medical penlight 2014-12-29 21:44:44 -08:00
GunHog
4f3d955ca1 Fixes #6654 
Sets the AI's encryption key to slot 2 so it is not lost upon the AI
being traitorized.
Fixes #6654 by reverting the change in #6399 to the AI's key.
 2014-12-29 19:55:01 -06:00
Razharas
76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
 2014-12-28 11:20:15 +03:00
Razharas
208b59c30e Fixed stuff tkdrg pointed out 
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
 2014-12-28 10:49:04 +03:00
tkdrg
0b4261e016 Merge pull request #6355 from AnturK/librarian_pda 
Adds Librarian PDA cartridge
 2014-12-27 01:44:49 -03:00
Remie Richards
1f288f56ae Merge pull request #6290 from Xhuis/porta_console 
Handheld crew monitor
 2014-12-27 01:43:42 +00:00
Cheridan
12ad2b796d Merge pull request #6541 from phil235/GrenadeAssemblyConstructionFailMsgFix 
Assembly holder no longer needs to be secured.
 2014-12-25 16:16:00 -06:00
phil235
8ab92e753a Assembly holder is no longer secured or unsecured. Screwdrive now disassemble it and attack_self to interact with its parts. 
Adding feedback message when trying to attach two assemblies that aren't both in attach mode.
Fix hacky code to prime grenade by pulsing its assembly.
Removing some commented code and some duplicated proc instances.
Fixing a typo.
 2014-12-24 01:50:19 +01:00
Razharas
1b45752b05 Fixed conflicts 
Ye again and again and again and again
Do it again, do it again~
 2014-12-23 05:39:39 +03:00
Razharas
92fc9b5d1b And some more little fixes 
Return of the prob to foam smashing
Correct laserpointer check
Correct wield behaviour with hulk
 2014-12-23 05:22:20 +03:00
paprka
2371e2ebd8 renames chef to cook 2014-12-22 17:02:06 -08:00
hornygranny
108a8cc155 Merge pull request #6473 from Delimusca/grenadeinhands 
Fixes grenades looking like flashes.
 2014-12-22 11:10:05 -08:00
MrPerson
c002d11ee7 Merge pull request #6476 from Cheridan/nightcrawler 
Refactors snowflake AI hosting in ninja
 2014-12-21 17:02:48 -08:00
Remie Richards
5a48f313cb Merge pull request #6399 from paprka/radioshit 
Removes useless standard encryption keys from headsets
 2014-12-21 05:08:10 +00:00
Razharas
9a27fe7c8d Conflict fix 
Yeah makes it all work
 2014-12-21 06:12:33 +03:00
Delimusca
80a4bc285d Adds empgrenade inhand, removes missed comment 2014-12-19 18:11:27 -07:00
Cheridan
25cc2999b0 Refactors snowflake AI hosting in ninja 
why did i volunteer for this

It just has an integrated intellicard now. The gloves do the transferring.
Also Intellicards are all called Intellicards now and not Intelicards.

the ai_transfer proc is less awful but it's still
awful
awful awful awful
 2014-12-18 21:03:09 -06:00
Delimusca
332cc37b13 Added grenade inhands. 2014-12-18 17:58:43 -07:00
Delimusca
4bdf83c59f Revert "adds grenade inhands." 
This reverts commit d1295616c8.
 2014-12-18 17:27:01 -07:00
Delimusca
d1295616c8 adds grenade inhands. 2014-12-18 16:57:47 -07:00
AnturK
e573f02acc Check trimming 2014-12-17 14:36:49 +01:00
phil235
d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
paprka
9b050ff010 removes meta protection from binary translator key 2014-12-16 00:37:54 -08:00
Razharas
f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution
 2014-12-16 02:52:08 +03:00
paprka
feeb650701 Removes useless standard encryption keys from headsets 2014-12-15 14:59:19 -08:00
Cheridan
f9eacb4498 Merge pull request #5854 from A4Brogan/Ghetto_Banana_Lamp 
Ghetto Banana Lamp
 2014-12-14 23:51:18 -06:00
AnturK
a1f3a51dab Adds Librarian PDA cartridge 2014-12-14 13:59:35 +01:00
Razharas
0b26a71a71 Merge pull request #6333 from tkdrg/singulobj 
The singularity/narsie are no longer machines
 2014-12-14 10:02:39 +03:00
Razharas
21a2c2d21e Made clumsiness into disability 
I really dont want to make clumsy_act()
 2014-12-14 08:04:48 +03:00
Razharas
44cc6c6d97 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-14 03:07:13 +03:00
Cheridan
c104ad6cd4 Merge pull request #6323 from AndroidSFV/fix6313 
Fixes 6313
 2014-12-12 23:01:43 -06:00
tkdrg
79e8ad4142 The singularity/narsie are no longer machines 2014-12-12 19:42:37 -03:00
Razharas
8d110ee496 Tiny clean up, still lots of work to do 
Only compiletested, these changes were never tested in the game yet
 2014-12-12 23:57:11 +03:00
AndroidSFV
3a0927febd Fixes 6313 2014-12-12 11:16:54 -06:00
Razharas
11f6c7c401 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-12 04:51:16 +03:00
Razharas
0921aa201f Added datum mutations 
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
 2014-12-12 04:48:11 +03:00
Hornygranny
98a865298a Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/mecha/mech_fabricator.dm
 2014-12-11 13:53:37 -08:00
Xhuis
947074d085 Adds the handheld crew monitor. 2014-12-09 19:42:54 -05:00
Hornygranny
af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2014-12-09 16:03:45 -08:00
oranges
41f0d0e04f Fix flash messages when failing to flash 
It would give the success message when flashing carbons even if the flash
had actually failed to work
 2014-12-09 09:38:26 +13:00
Razharas
da35b4dadc Merge pull request #6115 from CorruptComputer/pdashitstorm 
Added a cancel button to the PDA
 2014-11-28 20:52:38 +03:00
Razharas
d2848e5f95 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-28 00:32:30 +03:00
CorruptComputer
058e342e95 Added a cancel button to the PDA 2014-11-27 14:27:00 -06:00
Razharas
275d7fdd77 Merge pull request #6038 from paprka/hatfix 
fixes head of security and warden hat flashbang confusion
 2014-11-27 17:14:51 +03:00