cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-31 20:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,179 Commits 59 Branches 14 Tags
94de5c997e3f8155b981be4ac6b5e19bf59ebd80
Commit Graph

396 Commits

Author SHA1 Message Date
Swag McYolosteinen
afa1b76cde Merge pull request #8190 from xxalpha/cyberimplants 
Cybernetic Implants
 2015-03-21 13:19:26 +01:00
xxalpha
d9921411b8 Changed anti-drop implant emp_act(). Added designs to mech fabricator. 2015-03-21 00:17:27 +00:00
xxalpha
69d4536844 Code tweaks. Designs are now in 'Medical'. 2015-03-20 22:57:52 +00:00
xxalpha
a9b18759f2 Fixed HUD examine features. 2015-03-19 19:41:05 +00:00
xxalpha
31de411a11 Merge remote-tracking branch 'upstream/master' into cyberimplants 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/mob_defines.dm
 2015-03-18 20:11:51 +00:00
GunHog
6032c3d966 Minor Experimentor relic tweaks 
- Nerfs the explosion relic so it can only explode once.
- The PetSpray relic now has a chance to destroy itself on use.
- Prevents the Experimentor re-rolling the function of a relic.
- Added low priority logging for the rest of the relics.
- Fixed the relic messages not showing to the user.
 2015-03-16 15:57:29 -05:00
Cheridan
7e011680ec Merge pull request #8237 from GunHog/CherryFlavoredPins 
Loyalty Implant Firing Pins
 2015-03-13 12:57:28 -05:00
GunHog
1f400f6860 Increases requirements 
Reqs to make it are now Combat 6, Mats 6, Power 3.
 2015-03-13 12:15:49 -05:00
xxalpha
821a967986 Added Research designs for all implants. Added brain implant emp_act(). 2015-03-10 23:39:08 +00:00
GunHog
193372b407 Loyalty Implant Firing Pins 
- Allows the construction of Loyalty Pins at Combat tech 5, instead of
10.
 2015-03-08 16:46:41 -05:00
norill
3796f32394 fixed improper req_tech "power" -> "powerstorage" in several research designs 2015-03-08 18:23:34 +01:00
Cheridan
95e269e211 Merge pull request #8122 from Xhuis/miners_messiah 
Adds the ore satchel of holding
 2015-03-06 15:15:40 -06:00
Xhuis
2499ed82f4 Adds the ore satchel of holding 2015-03-03 07:26:58 -05:00
phil235
d2d0888432 Merge pull request #7726 from xxalpha/traymesons 
Mesons+T-Ray = Engineering Goggles
 2015-03-02 19:24:06 +01:00
Cheridan
8d9d45131b Merge pull request #8004 from GunHog/RemovesXenoFunFromExperimentor 
Replaces Xenomicrobes with Sulfuric Acid
 2015-03-02 01:12:56 -06:00
xxalpha
f9ebb2cff7 Merge remote-tracking branch 'upstream/master' into traymesons 
Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi
 2015-02-27 21:15:01 +00:00
Razharas
12e4047cbe Merge pull request #7988 from Menshin/protalathe_matcheck_fix 
Fixes protolathe incorrectly checking material amount
 2015-02-27 11:11:52 +03:00
GunHog
8c86bb5031 Replaces Xenomicrobes with Sulfuic Acid 
- Xenomicrobes replaces with Sulfuric Acid
 2015-02-25 23:06:13 -06:00
Menshin
48edc8b7ae Fixes protolathe incorrectly checking material amount. 2015-02-25 21:12:14 +01:00
paprka
1d552123dc hos gun revert 2015-02-24 21:54:48 -08:00
paprka
393123b50b Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs 
Conflicts:
	code/modules/projectiles/gun.dm
	icons/obj/guns/energy.dmi
 2015-02-24 20:03:33 -08:00
Razharas
33a650d2c9 Merge pull request #7833 from RemieRichards/AttackbyParams 
Attackby() now contains a Params argument.
 2015-02-25 04:07:01 +03:00
phil235
6d64c6ba10 Revert "Replaces Xenomicrobe gas from Experimentor." 2015-02-24 23:22:43 +01:00
Remie Richards
b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams 
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
 2015-02-24 22:16:53 +00:00
GunHog
263682009e Merge remote-tracking branch 'remotes/upstream/master' into ExperimentorFunRemoval 
Conflicts:
	code/modules/research/experimentor.dm
 2015-02-24 14:23:36 -06:00
hornygranny
c0c8a739e2 Merge pull request #7721 from paprka/miening 
Mining & mine-related chem changes
 2015-02-22 20:17:24 -08:00
GunHog
137e0b3e7f Replaces Xenomicrobe gas from Experimentor. 
Replaces Xenomicroboes with Sulfuric Acid (subject to change).
 2015-02-21 03:13:27 -06:00
GunHog
cd00e07f4f Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor 
Conflicts:
	code/modules/research/experimentor.dm
 2015-02-20 15:23:07 -06:00
GunHog
1cd892a0fd Experimentor Invesigate Take 1 
- Logs lots of the things to experimentor investigate.
 2015-02-20 15:09:59 -06:00
phil235
7af2e457c8 Merge pull request #7705 from GunHog/NVG_Mesons 
Adds NVG Mesons
 2015-02-20 17:44:38 +01:00
Razharas
e4fa3369f2 Merge pull request #7743 from GunHog/YetAnotherExperimentorFix 
Fixes E.X.P.E.R.I-MENTOR blood sacrifice!
 2015-02-20 09:51:55 +03:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
hornygranny
9b91896897 Merge pull request #7769 from phil235/rapidDupeProcFix 
Fixes bugs with experimentor relics with rapidDupe proc.
 2015-02-18 21:49:48 -08:00
GunHog
f9047c7a1c Admin logging for experimentor itself 
- Admin logging for the chemleak event (Mutation, Xenogas, Borging gas)
- Fix for empty pick() runtime
 2015-02-18 16:50:11 -06:00
paprka
074a139576 Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs 
Conflicts:
	icons/obj/guns/energy.dmi
 2015-02-18 02:29:07 -08:00
phil235
dcf99380b6 Merge pull request #7653 from GunHog/IonCarbinesFor-k-ommandos 
Introducing the Ion Carbine!
 2015-02-18 00:16:33 +01:00
GunHog
0f9cc3aa49 Admin logging for Experimentor Relics 
- Adds admin logging for PetSpray, Flash, and Exploding relics.
- Also fixes some of the oview() based procs.
 2015-02-16 11:16:02 -06:00
phil235
ab3b588ad7 Fixes rapidDupe proc not deleting all the dupe it creates 
Fixes dupes always being thrown in the same direction.
Fixes being able to spam click the relic to avoid the cooldown limitation.
 2015-02-16 14:03:57 +01:00
paprka
71758715fa some typo fixes 2015-02-15 13:33:15 -08:00
paprka
8b12b14f59 hospistol and disabler stun revolver 2015-02-15 13:31:31 -08:00
GunHog
a80e4a7e25 Fixes #7741 
Fixes #7741, the Experimentor's tech improvement malfunction now works
as expected.
 2015-02-14 22:22:57 -06:00
paprka
b2071bfdbf borg updates 2015-02-14 17:38:17 -08:00
paprka
f6942bb955 Merge branch 'miening' of https://github.com/paprka/-tg-station into miening 2015-02-14 17:26:19 -08:00
paprka
b67f9cec72 Merge branch 'master' of https://github.com/tgstation/-tg-station into miening 2015-02-14 17:08:39 -08:00
xxalpha
28d1e9bad2 Several additions and new sprites. 
Reverts glasses.dm
 2015-02-14 19:24:41 +00:00
Iamgoofball
2d52a74064 song name? 2015-02-14 01:29:54 -08:00
paprka
88760896ad initial commit 2015-02-13 20:59:39 -08:00
Menshin
04aea90f86 * Building an item from the protolathe/imprinter now correctly returns to the previous screen (categories or search) 
* A typo fixed
 2015-02-13 22:33:58 +01:00
GunHog
50576c367f Adds NVG Mesons 
- Adds Night Vision Optical Mesons Scanners to RnD.
 2015-02-13 12:23:07 -06:00
paprka
54040d9867 stun changes and stun revolver 2015-02-13 09:26:31 -08:00