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
23,961 Commits 61 Branches 14 Tags
38605d1aeee51f1e4b9c364b0b30c6e825252c3c
Commit Graph

859 Commits

Author SHA1 Message Date
Jordie
15e50de0fe Merge pull request #11694 from bear1ake/point-zero 
Remove a bunch of useless .0 in vars
 2015-09-13 21:47:09 +10:00
Jordie
f02589180d Merge pull request #11698 from GunHog/MaybeNowSecWillWantThem 
Added a taser function back to the Advanced Energy Gun
 2015-09-13 21:42:45 +10:00
GunHog
34b5dbf5e7 Buffs AE Gun 
- Gives Advanced Energy Gun a taser mode.
- Allows them to accept Seclites.
 2015-09-10 11:27:30 -05:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Cheridan
304d91fa2c Merge pull request #11606 from Firecage/gunnames 
This gives most projectile guns less generic names.
 2015-09-09 10:45:18 -05:00
Firecage
2a90cd109e Stetchkin pistol rename. 2015-09-09 17:36:14 +02:00
Firecage
42a28af718 Updated gun names. 2015-09-07 10:06:14 +02:00
Firecage
63657bb2e7 Adjusts some gun names like sugggested. 2015-09-06 18:09:42 +02:00
Firecage
1b119f6aef Fixes the russian revolver name, my mistake. 2015-09-06 14:30:43 +02:00
Firecage
56925928eb places /improper in the gun names. 2015-09-06 14:27:54 +02:00
Firecage
9c341fb128 This gives most projectile guns less generic names. 2015-09-06 13:43:38 +02:00
Razharas
93b9f96cfa Merge pull request #11341 from bgobandit/suicideisnotajoke 
Adds/tweaks several suicide messages.
 2015-09-06 06:42:00 +03:00
Cheridan
a816ff5f8f Merge pull request #11385 from Aranclanos/extrapug 
Fixes pugs not following their tail.
 2015-09-04 23:20:25 -05:00
bgobandit
ca34015b85 Removes minibomb suicide message. Fixes wand suicide message. 2015-09-02 23:07:40 -04:00
duncathan
51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Aranclanos
0d1d321651 Fixes pugs not following their tail. 
The staff of change won't create invisible pugs anymore, same with the experimentator relics.
Removes a leftlover pug typepath.
 2015-08-25 05:28:58 -03:00
Swag McYolosteinen
825b5794c7 Merge pull request #11239 from Firecage/del2qdel 
del() to qdel()
 2015-08-19 11:50:24 +02:00
Remie Richards
f77047b640 Merge pull request #11185 from Cheridan/brycepaxsbrain 
Logging Syntax Improvement
 2015-08-18 20:24:42 +01:00
Firecage
2ee2c8513e This fixes the Syndicate Carbine. 2015-08-17 00:51:23 +02:00
Firecage
bf13763e3b Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel 2015-08-16 23:34:03 +02:00
Firecage
dfae1e0b53 Changes a lot of del() to qdel() 2015-08-16 23:33:22 +02:00
phil235
bc6ffdcf31 Merge pull request #11194 from Aranclanos/wabbajack 
The staff of change projectile will qdel the mob instead of manually …
 2015-08-15 22:28:27 +02:00
phil235
531334087e Merge pull request #11181 from Miauw62/sch-e-slch-schsch-schshc-sc-hschsch-schs-hcshchschschschschshcshshch-schsh-cshcsh-chschsch-s-chschscsh-cshcshcsh 
Fixes ranged stuns causing slurring.
 2015-08-14 11:15:41 +02:00
Aranclanos
ca98ac5151 The staff of change projectile will qdel the mob instead of manually deleting it. 
Added a warning for when the mob controller removes a null from the mob list.
 2015-08-13 21:40:00 -03:00
Cheridan
5979ffdec7 Logging Syntax Improvement 2015-08-13 12:14:14 -05:00
Swag McYolosteinen
2bb4f63023 Merge pull request #11087 from phil235/GirderSinguloPull 
Girder deconstruction bugfix
 2015-08-13 16:33:28 +02:00
Miauw
771bf84cc1 Fixes ranged stuns causing slurring instead of stuttering. Fixes #8189 2015-08-13 12:49:18 +02:00
phil235
866cdbcd34 Fixes plasma cutter firing sound, as well as lack of sound when slicing girder/statues. 
Rearrange girders.dm
Singularity_pull() no longer unanchors anchored objects (because it breaks the deconstruction of table/girder/states/etc, and make mech pullable by mobs), but it still pulls them.
 2015-08-07 23:14:45 +02:00
phil235
bec7be024f Fixes runtime when firer is null. 2015-08-07 15:54:21 +02:00
Jordie
0b5223a687 Merge pull request #11041 from phil235/PlasmaCutterChange 
Plasma cutter tweaks
 2015-08-07 19:35:15 +10:00
phil235
b90fcaa765 Remove mech immobilization when shooting. 
Changed the fix to delete bullets the user is on the target loc while he fires so we don't get floating bullets.
 2015-08-06 16:31:30 +02:00
phil235
207fbc7cb6 Fixes being able to run into your own bullet (both as a mob or inside a mech). 2015-08-06 01:21:55 +02:00
phil235
e2ca2de4b2 Plasma cutter's fire rate is now a bit slower but its projectile can pierce multiple asteroid walls(2 for normal cutter, 3 for advanced). Its range is no longer reduced in pressurized environment (so the projectile is no longer invisible). 2015-08-05 21:58:19 +02:00
Remie Richards
5434bb7854 Merge pull request #10970 from phil235/SyringeProjShieldBlockFix 
Projectile blocking fixes
 2015-08-03 05:28:28 +01:00
phil235
cdd15b7c27 Removes some unneeded code(flag = "magic" when already inheriting it from parent, adding a 0 argument to on_hit when it already defaults to 0). 
Fixes syringe dart not respecting shield blocking.
Projectile doesn't show the hit message anymore if 100% blocked (shield blocking mostly). (but it is still logged)

Fixes deflected dart projectiles not being logged.
 2015-08-01 16:57:27 +02:00
bear1ake
5af0bdec25 fix ian stuff 2015-07-31 01:18:03 +09:00
Jordie0608
b48eab3c43 Merge branch 'master' of https://github.com/tgstation/-tg-station into fixingthingslikewillsmithfixedthewildwest 
Conflicts:
	icons/obj/guns/energy.dmi
 2015-07-26 18:29:51 +10:00
Jordie
b2948fcab7 Merge pull request #10659 from phil235/HandcuffOverlayFix 
Handcuff, fire, overlays_standing fixes
 2015-07-23 22:21:52 +10:00
Jordie0608
64ebc1f1af icon reversions 2015-07-23 18:46:01 +10:00
Jordie0608
1daaf6f713 fixes action button and m1991 icon 2015-07-23 17:13:01 +10:00
phil235
40967044cb Merge pull request #10707 from KorPhaeron/fixes 
Fixes
 2015-07-21 20:46:27 +02:00
Cheridan
cbe76ea2c0 Merge pull request #10598 from phil235/CatchThrownPieFix 
Changes to throwing
 2015-07-20 20:26:35 -05:00
Cheridan
96bfea50a6 Merge pull request #10635 from Iamgoofball/patch-102 
Changes up the Bulldog Bioterror Dart
 2015-07-20 16:41:35 -05: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
phil235
76feff5dfa Merge branch 'master' of https://github.com/tgstation/-tg-station into HandcuffOverlayFix 
Conflicts:
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/head/helmet.dm
	code/modules/mob/living/carbon/carbon.dm
 2015-07-20 22:37:06 +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
KorPhaeron
65f56e146d Liberty Station fix, alien whispering fix, plasma statue logging. 
Fixes the liberty station spawning an SMG without a firing pin by
creating an unrestricted variant of it. Added unrestricted L6 and
unrestricted bulldog object types for admin spawn since I was already
there.

Fixes aliens being able to whisper to ghosts.

Adds logging to shooting plasma statues.
 2015-07-19 10:31:52 -05:00
phil235
d72cbcaf2f - fixes handcuff overlay on monkey not showing. 
- Fixes the lack of handcuff icon on the hand screen object for alien humanoids..
- fix legcuff overlay not showing on monkey.
- fixes fire overlay for monkey, aliens and cyborg, no longer looks human shaped.
- Made the regenerate_icons's subprocs at the carbon level more OOP.
 2015-07-17 01:15:21 +02:00
WJohn
3537d754b3 Merge pull request #10345 from Steelpoint/HoSArm 
[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing
 2015-07-16 11:29:22 -04:00
Jordie0608
e985aa05d3 Merge branch 'master' of https://github.com/tgstation/-tg-station into thisalsomeansammoleftcannowbecalculatedasafactorofoverlayslength 
Conflicts:
	code/modules/projectiles/guns/energy/temperature.dm
 2015-07-16 21:02:50 +10:00