cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,413 Commits 61 Branches 14 Tags
1759d492f04fa4a5e4e39c405e747956800a52dc
Commit Graph

3396 Commits

Author SHA1 Message Date
xxalpha
1759d492f0 Made Agent IDs rewrittable. 
Added antag check for forging.
 2015-07-22 22:38:13 +01:00
Aranclanos
47706cf88b Merge pull request #10717 from Ikarrus/thisisafix 
Fixes Reset and Purge having "This is a bug." law on examine
 2015-07-21 16:12:43 -03:00
phil235
452313a5fa Merge pull request #10534 from Xhuis/borg_deconstruct_all_firelocks_on_the_station_then_flood_plasma 
Firelock Construction and Deconstruction
 2015-07-21 17:52:14 +02:00
phil235
d2616d52fc Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix 
Conflicts:
	code/game/atoms.dm
	code/game/atoms_movable.dm
 2015-07-20 22:41:45 +02:00
Ikarrus
bc5eac33a8 Needs a check here to let reset and purge be used. 2015-07-20 09:02:46 -06:00
Ikarrus
ec3677da2d Fixes Reset and Purge having "This is a bug." law on examine 
No reason to have this string as far as I can tell.
 2015-07-19 23:20:04 -06:00
phil235
2833f59f5f A typo and a forgotten thing to do. 2015-07-19 22:16:09 +02:00
phil235
94d072828f Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix 
Conflicts:
	code/game/atoms_movable.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/weapons.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/living_defines.dm
	code/modules/reagents/reagent_containers.dm
 2015-07-19 21:53:39 +02:00
Cheridan
b9f67a8334 Merge pull request #10668 from phil235/CyborgFlashFix 
Fixes drone and cyborg not being affected by mounted flashers.
 2015-07-20 11:53:03 -05:00
Cheridan
1c05fbcf6a Merge pull request #10450 from phil235/MechRefactoring 
Mech code refactor
 2015-07-20 02:00:11 -05:00
WJohn
001dd150e0 Merge pull request #10655 from MMMiracles/TWANG 
Adds a 'TWANG' sound effect for guitars
 2015-07-19 13:34:40 -04:00
Swag McYolosteinen
a2f338cabf Merge pull request #10343 from GunHog/Borgie_Lights 
[Review] Cyborg headlamps!
 2015-07-19 19:26:09 +02:00
Swag McYolosteinen
0f244730bc Merge pull request #10626 from Ikarrus/lizardmov 
AI Module Updates
 2015-07-19 18:06:06 +02:00
GunHog
f4407871ab Merge remote-tracking branch 'remotes/upstream/master' into Borgie_Lights 
Conflicts:
	code/game/gamemodes/shadowling/shadowling_abilities.dm
 2015-07-18 21:56:25 -05:00
phil235
e2d76a0116 Fixes drone and cyborg not being affected by mounted flashers. 
Remove eye stat damage from flashbang's bang() proc (eye damage is already handled in carbon/flash_eyes())
Changed many flash producing effect to affect all carbons instead of only humans.
The experimental weldingtool now produces less light than regular welding tool and can be used safely with only sunglasses.
 2015-07-17 17:12:16 +02:00
Ikarrus
bcbd4da656 Merge branch 'master' of https://github.com/tgstation/-tg-station into lizardmov 
Resolved Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
 2015-07-16 20:10:20 -06:00
phil235
3e9ab4e3c1 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/__HELPERS/unsorted.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/reagents/Chemistry-Recipes.dm
 2015-07-16 14:09:12 +02:00
MMMiracles
ca419e47c6 adds a 'TWANG' sound effect for guitars when hitting something 2015-07-16 07:59:10 -04:00
phil235
34db8dd695 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring 
Conflicts:
	code/game/mecha/equipment/mecha_equipment.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/game/mecha/mecha.dm
 2015-07-16 13:50:01 +02:00
duncathan
ae417d2a03 Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
 2015-07-16 04:27:25 -06:00
Firecage
2641e1a684 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into Procs 2015-07-15 23:52:55 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Cheridan
92f728077e Merge pull request #10612 from Ikarrus/grenades_burn 
Fixes grenade casings burning forever
 2015-07-15 14:30:07 -05:00
Ikarrus
d1175653dd - Reverts Map and Lizardmov changes 
- Asimov's subject can now be modified from "human beings"
- You can examine AI modules to check their laws
 2015-07-15 08:36:32 -06:00
Ikarrus
c713797566 Makes it easier to check freeform boards by adding a cancel button to inputs. 2015-07-14 23:12:40 -06:00
Ikarrus
ef548f6f67 Adds Lizardmov AI Module 2015-07-14 22:35:05 -06:00
phil235
de288d013e Merge pull request #10591 from bustygoku/Under-Pressure 
Tanks Show Pressure When Examined
 2015-07-14 15:51:47 +02:00
Ikarrus
83a435273e Fixes grenade casings burning forever 2015-07-13 22:48:01 -06:00
Cheridan
723e6d6358 Merge pull request #10561 from xxalpha/hugboxone 
Adds an empty hugbox.
 2015-07-13 22:11:11 -05:00
bustygoku
4d0739c387 LowerCase K 2015-07-13 17:31:50 -07:00
Remie Richards
f08d4f4085 Merge pull request #10554 from nukeop/rcdbugfix 
Fixes RCD-related issues
 2015-07-14 01:04:48 +01:00
phil235
359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring 
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
 2015-07-14 01:20:37 +02:00
phil235
72547af481 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff 
Conflicts:
	code/modules/mob/living/carbon/human/species.dm
 2015-07-14 01:02:37 +02:00
phil235
b570af6795 Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall) 
Moved last_bumped var from movable to living.
Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine().
Fixes sprite when hunter leaps into a wall. 10428
Removed some commented code here and there.
Remove allow_spin var, throw_at now uses a spin argument for that.
Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check.
A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent.
A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10)
Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target.
Fixes losing all momentum when getting out of a thrown closet. 6569
A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479
Fixes the killer crusher. 10507
 2015-07-14 00:51:19 +02:00
bustygoku
bde367b9b9 KPa Added 2015-07-13 15:30:21 -07:00
bustygoku
de699d3b5b Tanks Show Pressure When Examined 2015-07-13 04:09:39 -07:00
WJohn
37cfc11cd4 Merge pull request #10481 from Ikarrus/ganggangganggang 
Gang Mode Update
 2015-07-12 19:37:54 -04:00
duncathan
71ac607a6b Revert "merge conflicts?" 
I fucked this up
 2015-07-12 12:52:32 -06:00
xxalpha
66e2941531 Adds an empty hugbox for admins to give. 
Maintbox

Re-added hugbox to boxstation perma.
 2015-07-12 17:44:13 +01:00
Swag McYolosteinen
4878a7b8d5 Merge pull request #10531 from duncathan/rpddelay 
Speeds up RPD and pipe unwrenching
 2015-07-12 12:41:49 +02:00
duncathan
27f4bf3ee0 merge conflicts? 2015-07-11 19:56:54 -06:00
Cheridan
a0a20b0b0a Merge pull request #10484 from Ikarrus/augmaintenance 
Makes augmentations more difficult to maintain
 2015-07-11 19:54:58 -05:00
duncathan
e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00
Cheridan
61d5425c3f Merge pull request #10503 from phil235/RevolverMisfireFix 
Fixes for lighter, heart attack, defib, light fixture and other stuff
 2015-07-11 19:01:04 -05:00
Cheridan
68c32438bb Merge pull request #10525 from phil235/FixFix1 
Some fixes and stuff....
 2015-07-11 18:06:29 -05:00
barackobama
f02c32c8ee fixes #10547, adds progress bars to grilles and windows, also fixes #9748 
I guess
 2015-07-11 19:49:32 +01:00
barackobama
2694fab4d8 fixes RCD-related issues 2015-07-11 19:15:33 +01:00
Xhuis
f40b4381d4 Separates construction into the door and a frame 2015-07-11 11:25:14 -04:00
duncathan
c870469a39 speeds up RPD and pipe unwrenching 2015-07-10 18:03:43 -06:00
phil235
f580ad3863 Merge pull request #10492 from Miauw62/recorders 
fixes tape recorder spans.
 2015-07-10 22:57:42 +02:00