cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 17:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,304 Commits 61 Branches 14 Tags
4b41d340bd2fc54dac38106fb26f23553b299fe7
Commit Graph

5254 Commits

Author SHA1 Message Date
Cheridan
4b41d340bd Merge pull request #3903 from phil235/HardHatUpdateFix 
Fixes hard hat sprites not updating
 2014-06-12 19:29:14 -05:00
Alex
13f53bdb81 Merge pull request #3842 from Cheridan/stopbeatingpeople 
'Released' Sechud Icon Edit
 2014-06-12 10:41:28 +01:00
Alex
9c6ac5c5f7 Merge pull request #3818 from phil235/ChameleonMimeFix 
FIx issue #3692
 2014-06-12 10:34:41 +01:00
Alex
6c6cb3d70d Merge pull request #3859 from Cheridan/tacticool 
Casing rotation
 2014-06-12 10:29:26 +01:00
Cheridan
8d4e73a493 Merge pull request #3885 from Giacom/gravity_bounce 
Zero gravity bouncing.
 2014-06-11 20:33:52 -05:00
Cheridan
5a57cc85c3 Update shotgun.dm 
shells spin faster
 2014-06-11 19:15:53 -05:00
phil235
aea78dc45a Fix hardhat sprite not updating 2014-06-11 20:11:10 +02:00
Alex
17dfe57509 Merge pull request #3803 from Cheridan/pills_here 
Pill fixes
 2014-06-11 12:10:23 +01:00
Alex
4c627b956c Merge pull request #3760 from Ikarrus/bomblogging 
Improved bomb logging for admins
 2014-06-11 11:42:16 +01:00
Alex
fda9885e61 Merge pull request #3820 from Ikarrus/nukechecker 
Removes hacky code in favour of a process() check for the nuke disk
 2014-06-11 11:40:56 +01:00
Alex
a4cedc741e Merge pull request #3848 from Rockdtben/roboticHealRefactor 
Moved item_heal_robotic out of obj/item and into mob_helpers.dm
 2014-06-11 11:39:20 +01:00
Alex
67f4808ca5 Merge pull request #3834 from phil235/DebrainMaskFix 
Fixes being unable to debrain patient wearing breathmask
 2014-06-11 11:38:32 +01:00
Cheridan
29386858c7 Merge pull request #3878 from Ikarrus/stripfix 
Fixes stripping stunned/dead people
 2014-06-10 09:35:21 -05:00
Giacomand
6f61d000b0 Finalized gravity bouncing. 2014-06-09 21:09:16 +01:00
Giacomand
f4b0a48253 Merge branch 'master' of https://github.com/tgstation/-tg-station into gravity_bounce 
Conflicts:
	code/modules/mob/living/living.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/gravitygenerator.dm
 2014-06-09 20:26:17 +01:00
Cheridan
13f097ca9a Merge pull request #3853 from phil235/AlienCuffBreakFix2 
Alien roars instead of screaming when breaking cuffs.
 2014-06-09 14:20:08 -05:00
Cheridan
b827a3b5f2 Merge pull request #3862 from Kelenius/OfSlimesAndCommands 
Of slimes and commands
 2014-06-09 12:39:52 -05:00
ikarrus
df7b758d34 Fixes stripping stunned/dead people 
Fixes #3877
 2014-06-09 08:51:38 -06:00
Cheridan
fe26d167f7 Merge pull request #3847 from Rockdtben/RefactorSoulstone 
Moved these 2 procs out of obj/items/ and to obj/items/devices/soulstone
 2014-06-07 15:34:52 -05:00
Kelenius
9e78e71537 Right 2014-06-07 13:37:36 +04:00
Cheridan
43f9e78493 Casing rotation 
Spent casings ejected from firearms will spin as they 'tumble' towards the ground.
Improved sprites for shotgun shells
Improved sprite for bullet projectile.
 2014-06-07 01:23:49 -05:00
phil235
ed42dd2d58 Merge pull request #8 from tgstation/master 
update repo
 2014-06-06 20:16:35 +02:00
phil235
1dfaa6711a overriding cuff_break proc 2014-06-06 20:10:35 +02:00
phil235
f9c2b9d6d8 Aliens stop screaming like hulk when breaking handcuffs 2014-06-06 20:10:26 +02:00
Cheridan
c4aebda258 Merge pull request #3421 from GunHog/AI_Lockdown 
Gives Malfuncting AIs the Hostile Lockdown ability!
 2014-06-06 12:17:53 -05:00
Alex
9b083e95ac Merge pull request #3841 from ike709/2014-06-04-#3788-Fix 
Fixes #3788 Animals retaliating after death
 2014-06-06 09:17:36 +01:00
ike709
a6aca7617f Removed useless changes from first commit. 2014-06-05 20:33:07 -05:00
ike709
8708a65016 None of the animals should retaliate while dead. 2014-06-05 20:19:19 -05:00
Rockdtben
569d12facf Moved item_heal_robotic out of obj/item and into mob_helpers.dm 2014-06-05 19:25:08 -05:00
Rockdtben
1725d633fb Moved these two procs out of obj/items/ and to obj/items/devices/soulstone 
transfer_soul(var/choice as text, var/target, var/mob/U as mob).
init_shade(var/obj/item/device/soulstone/C, var/mob/living/carbon/human/T, var/mob/U as mob, var/vic = 0)

Fix some poor formatting in soulstone.dm
 2014-06-05 18:34:06 -05:00
Alex
7d607d0bde Merge pull request #3826 from Ikarrus/obscuredstrip 
Strip Menu now obscures items based on flags_inv
 2014-06-05 21:43:52 +01:00
Alex
6cce892cf6 Merge pull request #3831 from CollenN/bogemagchance 
Fixes typo in ion_storm New()
 2014-06-05 21:38:43 +01:00
Cheridan
6a7a9f8a78 'Released' Icon Edit 
Released -> Discharged
 2014-06-04 18:48:13 -05:00
ike709
85de677d1b Fixed issue #3788. Message "[src] gets an evil-looking gleam in \his eye" no longer displays when Pete is dead. 2014-06-04 01:12:29 -05:00
ikarrus
8e94bff33c -Giacom's Feeback 
-Belt, ID, and Pockets are no longer blocked by exosuits, as they are still visible
 2014-06-02 21:07:21 -06:00
phil235
4aa2a69674 null -> 0 2014-06-02 13:20:20 +02:00
ikarrus
ce35503695 Greyed out empty slots for easier readability 2014-06-01 22:45:28 -06:00
ikarrus
8cd20b3e77 Added checks in Topic() 2014-06-01 21:12:06 -06:00
phil235
44da7de01d Fixes being unable to debrain patient with breathmask 2014-06-02 01:22:46 +02:00
CollenN
5c69101766 Fixes typo in ion_storm New() 
I have no idea why you'd want to emag a bog, or how you'd emag a bog.
But regardless, you can now properly set the botEmagChance through
New().
 2014-06-01 15:22:50 -04:00
ikarrus
5a7db48f96 Improved readability of the strip panel with <BR>s 2014-05-31 14:26:48 -06:00
ikarrus
e47b75c02f Strip Menu now obscures items based on flags_inv 
I also made it look pretty
 2014-05-31 13:45:14 -06:00
Alex
b97fd1f884 Merge pull request #3809 from Cheridan/eugh 
Removes a word from ion_storm.dm
 2014-05-31 17:58:46 +01:00
Cheridan
47eeeefe31 Merge pull request #3731 from Ikarrus/internalshelp 
You can now set internals on someone else's belt and suit storage
 2014-05-31 11:43:47 -05:00
Miauw62
030647d6cc Merge pull request #3718 from hornygranny/cheeseallthewaydown 
sliceable snacks no longer infinitely stack
 2014-05-31 13:56:03 +02:00
ikarrus
4905beb67e Removes hacky code in favour of a process() check for the nuke disk's location 
Instead of having a lot of hacky checks to prevent the disk from leaving the Z-level, it will be checked periodically by process() if Z > 2
 2014-05-30 22:01:20 -06:00
phil235
23746fc228 under/det into under/rank/det 2014-05-31 00:36:26 +02:00
phil235
2436087b28 detective jumpsuit now in under/rank 2014-05-31 00:07:03 +02:00
phil235
4fdee9d777 mime and librarian jumpsuits now in under/rank 2014-05-31 00:03:35 +02:00
Hornygranny
c71f289c3c changed false comment 2014-05-30 10:13:22 -07:00