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
16,841 Commits 61 Branches 14 Tags
204fdb8b2fcd3872d1fd2e2002105caa12f8dcda
Commit Graph

3583 Commits

Author SHA1 Message Date
tkdrg
179003b57c Merge pull request #6808 from Boggart/readminbugfix 
Re-admin bugfixes.
 2015-01-10 01:29:01 -03:00
tkdrg
1f91ac52a3 Merge pull request #6894 from Miauw62/ayythelmaoening 
Emagged borgs will now properly unreference their MMI.
 2015-01-10 01:16:01 -03:00
tkdrg
4291df8918 Merge pull request #6887 from Incoming5643/MyLittleSlimeCannotBeThisCute 
Allows player slimes to use the slime faces that npc slimes can uses
 2015-01-09 18:00:47 -03:00
hornygranny
56bad0f7ce Merge pull request #6747 from paprka/gunchangesv2baby 
Further changes to the ranged stun system
 2015-01-08 16:09:37 -08:00
Incoming
819add5c0c *merges the slime face emotes into the generic emote list so there's no new VERB 
*makes a changelog so no one misses out on this important news
 2015-01-08 17:12:14 -05:00
Miauw
731a9c03e5 >greentext commit messages 2015-01-08 20:42:05 +01:00
Miauw
851f3e09b3 when i say copypasted, i mean it. 2015-01-08 20:00:47 +01:00
Miauw
ab6d6a9b70 Prevents this bug from turning into a hydra. 2015-01-08 19:56:44 +01:00
Miauw
109b0a434a Fixed #3251, emagged borgs will now properly unreference their MMI. 2015-01-08 19:49:48 +01:00
Incoming
27857ae90d Allows player slimes to use the slime faces that npc slimes can uses. 
Fixes #6882

Priority: Critical
 2015-01-08 04:47:35 -05:00
Cheridan
e4f42a2aef Merge pull request #6750 from phil235/VisibleMessageFixing 
Fixes visible_messages.
 2015-01-07 20:06:21 -06:00
paprka
2ba0cbbc7a Merge branch 'master' of https://github.com/tgstation/-tg-station into posfixes 
Conflicts:
	code/modules/mob/dead/observer/observer.dm
 2015-01-07 14:15:02 -08:00
Swag McYolosteinen
714cc8c59e Merge pull request #6780 from tkdrg/wooh 
Adds a (follow) link to ghost messages
 2015-01-06 20:58:56 +01:00
tkdrg
67c9b5be21 Changes (Follow) to (F) in the ghost chat 2015-01-06 16:28:24 -03:00
Sawu
906ab53921 Quickfix to conform with the rewrite. 2015-01-07 01:51:39 +11:00
Sawu
8fcd55bd4d Merge branch 'master' of https://github.com/tgstation/-tg-station into interactive 2015-01-07 01:43:44 +11:00
tkdrg
890c6f8ebe Merge pull request #6799 from Xhuis/knife_fix 
Makes the butcher cleaver a normal-sized item
 2015-01-06 03:26:30 -03:00
tkdrg
1716a82400 Merge pull request #6794 from psykzz/patch-4 
Cell() Update
 2015-01-06 01:22:30 -03:00
paprka
0cd34c9c2f changes syndicate borg equipment 2015-01-05 19:42:31 -08:00
paprka
f0712db606 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby 
Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
 2015-01-05 18:43:46 -08:00
Xhuis
8f42d43b04 Merge remote-tracking branch 'remotes/upstream/master' into knife_fix 2015-01-05 21:35:05 -05:00
Sawu
d091119545 Ergo's Changes 
*Examine shows NPCs a unique message
*NPCs should no longer stand and stare at people in combat.
*Toned down the amount of rudeness in their speech.
 2015-01-06 13:23:58 +11:00
Xhuis
a5c9a7292f Makes butcher's cleaver a child of kitchen knife 2015-01-05 17:23:03 -05:00
carnie
281df385a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 2015-01-05 19:52:03 +00:00
carnie
a730649167 Fixes breathing (indentation error) 
Fixes atmos machinery (old global list snuck back into code)
 2015-01-05 19:44:17 +00:00
Ergovisavi
7a83165f2b Merge pull request #6773 from phil235/ShadeBuckleFix 
Fixes simple animals not being able to unbuckle themselves.
 2015-01-05 10:45:13 -08:00
Boggart
5f42bac272 Fixes deadmins from being unable to re-admin after disconnecting. 2015-01-05 00:50:49 -07:00
Matt Smith
249e19b935 Cell() Update 
Was being output straight to the user, it looked like that might cause the order to be wrong.
Doing this because it looks like the intended results.
 2015-01-04 15:11:52 +00:00
Remie Richards
ed1375d454 Fixes Humanize and Monkeyize producing invisible changelings and never deleting their Animation overlay. 2015-01-04 11:03:10 +00:00
Sawu
47dd60e7bf Changes to the Chatter module. 
*NPCs now use pick_list to draw their speech from strings/npc_chatter.txt
 2015-01-04 16:37:59 +11:00
Remie Richards
3a10a3b198 Merge pull request #6427 from paprka/janitorbuffholyfuckvalvepleasenerf 
Adds dirt overlays for walking on simulated turfs
 2015-01-04 02:22:50 +00:00
carnie
a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2015-01-04 01:52:14 +00:00
paprka
a3153538f1 Merge branch 'master' of https://github.com/tgstation/-tg-station into posfixes 
Conflicts:
	code/modules/mob/dead/observer/observer.dm
 2015-01-03 17:51:25 -08:00
paprka
8527f23d85 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby 2015-01-03 17:05:27 -08:00
tkdrg
a411154581 Merge pull request #6755 from phil235/SpritesFixes 
Three sprite related fixes
 2015-01-03 19:20:00 -03:00
tkdrg
420ac3939a Adds a (follow) link to ghost messages 
Clicking on said link is the same as using the "Follow" verb and
selecting the sender's name. Inspired by the feature on baycode.
 2015-01-03 16:56:10 -03:00
TZK13
c0b4ea1092 Reverted removal of jerseys. 2015-01-03 10:33:45 -06:00
phil235
6d6547467a Fixes simple animals not being able to unbuckle themselves. 
Fixes pet slime. There's no longer two types of adult pet slimes, simplifying adult pet slime's Die() proc.
Fixing some absolute path in slime/slime.dm
 2015-01-03 14:35:14 +01:00
TZK13
bf5bddf0c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into Socks 
Conflicts:
	config/admins.txt
 2015-01-03 07:07:03 -06:00
Sawu
ce20829485 Changes to speech, comments 
*Added a couple of extra comments
*Added a bunch of extra words to the NPC's vocab, along with a suggestion.
 2015-01-03 15:54:57 +11:00
Sawu
6d3d638379 Change/fix to door checks. 
*Uses density now instead of layer.
 2015-01-03 15:26:32 +11:00
Sawu
91d1d0582c Quickfixes for SNPCs 
*Adds a variable for the chattyness of NPCs
*Removes unneeded variable
*Fixes NPCs using weapons/items after dropped
*Fixes some combat problems, makes them more robust in general
 2015-01-03 15:21:27 +11:00
Sawu
ba45b07db5 Adds updated, fixed versions of the Sawustation SNPCs, they mostly function but have a few minor problems, but are otherwise working. 2015-01-03 13:50:09 +11:00
phil235
eacdc7e920 Fixes emt cap sprite disappearing. 
Fixes bloodyhand overlay appearing in front of shield.
Fixes white pixels on some disposal pipe junctions sprites.
 2015-01-02 22:36:07 +01:00
phil235
f6003e12b5 Fixes visible_messages. Now ghost will properly see visible_messages and will only see the audible part of a visible_message if the src is hidden inside a container. 
Fixes people seeing visible_messages from a src that is in the dark or inside a container; and fixes people not seeing the message when they are in the dark but not the src.
 2015-01-02 16:10:54 +01:00
paprka
46ee047404 further changes to the ranged stun system 2015-01-01 22:22:03 -08:00
tkdrg
8e8b761ae2 Merge pull request #6716 from psykzz/patch-2 
Refactor Ears self healing
 2015-01-01 17:18:08 -03:00
tkdrg
be85bb6d17 Merge pull request #6707 from phil235/HostileAttackingTargetFix 
Fixes player controlled hostile simple animal not calling AttackingTarget() for their melee attack.
 2015-01-01 12:47:27 -03:00
tkdrg
7e48be5be0 Merge pull request #6686 from paprka/lizstutterv2 
Removes lizard stuttering
 2014-12-31 23:22:38 -03:00
paprka
d048dd87bd Merge branch 'master' of https://github.com/tgstation/-tg-station into janitorbuffholyfuckvalvepleasenerf 2014-12-31 17:14:03 -08:00