cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 20:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,396 Commits 61 Branches 14 Tags
fae181be7c518dfd0b0396cce2d4afcff3cbbca7
Commit Graph

226 Commits

Author SHA1 Message Date
Aranclanos
d2d92dd35f Merge pull request #4873 from optimumtact/clicktyclackety 
Adds click cooldown to clicking on mobs Fixes #4812 Take2
 2014-10-15 11:03:02 -03:00
Aranclanos
5561e8d9dc Merge pull request #5250 from phil235/SprayPasstableFix 
Fix for #5224
 2014-10-15 10:48:14 -03:00
phil235
72cc3274df Adding passtable and passgrille to obj/effect/effect and its children so effects aren't blocked by tables and grilles. 2014-10-14 18:34:19 +02:00
Swag McYolosteinen
7d11253f39 Merge pull request #4861 from Lo6a4evskiy/Custom_graffiti 
Choosing graffiti instead of drawing random one
 2014-10-09 16:31:13 +02:00
Francis Devine
5595d57f57 Add the click cooldown define to the last special defines 
This will stop these getting out of sync and let you change
all times with a single define
 2014-10-09 14:52:47 +13:00
Francis Devine
f737f7889c Defines for the define god 2014-10-09 14:49:28 +13:00
hornygranny
e611301f0f Merge pull request #5044 from Jordie0608/mapmergersoannoying 
Fixes #4788 Resin walls on the abandoned mining station
 2014-10-07 19:39:12 -07:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05:00
Jordie0608
208b136996 Merge branch 'master' of https://github.com/tgstation/-tg-station into mapmergersoannoying 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-10-07 21:56:06 +11:00
Lo6a4evskiy
18ad0292c3 fixed compilation errors 2014-10-07 12:47:53 +04:00
Lo6a4evskiy
41eb04356f Merge remote-tracking branch 'upstream/master' into Custom_graffiti 
Conflicts:
	code/game/objects/effects/decals/crayon.dm
 2014-10-07 12:43:59 +04:00
Remie Richards
5b8b883cf0 Merge pull request #5050 from Incoming5643/spiders,man 
Updates spiders to have full player functionality
 2014-10-06 14:24:39 +01:00
phil235
537280b4b9 Removing many instances of the no longer used second argument of message_admins() proc. 
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
 2014-10-05 01:29:30 +02:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
Incoming
8e99152226 Updates spiders to have full player functionality 
*All spiders can now web turf (but AI controlled non-nurses won't choose to), only nurse spiders can wrap items and lay eggs.
*Eggs laid by a player controlled nurse spider will eventually grow into player controlled spiders, while AI lain eggs will only result in AI spiders
*Adds non nurse spiders to the staff of change as they pass my rules for inclusion (Leaves a corpse, can do everything as a player the NPC can do, can't dominate a round by reproduction)

I take no responsibility for spidercode, it's a bit iffy but as far as I can tell it all works for players now.
 2014-10-01 18:58:07 -04:00
Jordie0608
210e4f12b5 Fixes resin walls icon on map maker + abandoned mining station 2014-10-01 13:41:48 +10:00
Lo6a4evskiy
b5f0753c8f Prevented from using popups away from crayon, popup now updates properly, mime colours are properly shown. 2014-09-28 14:02:08 +04:00
Lo6a4evskiy
396a115043 Merge branch 'master' of https://github.com/tgstation/-tg-station into Custom_graffiti 2014-09-28 12:20:22 +04:00
phil235
3248e23887 Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix 
Conflicts:
	code/modules/recycling/disposal.dm
 2014-09-25 18:45:53 +02:00
Lo6a4evskiy
8ab6bf0c15 Super Awesome Crayons! 2014-09-24 22:19:12 +04:00
Perakp
3f451f9b1b Warning cones can be worn on your head, with original codersprites. 2014-09-19 22:44:59 +03:00
Lo6a4evskiy
82e1ce9141 Choosing graffiti instead of drawing random one 2014-09-16 20:57:24 +04:00
phil235
87d7c9e91e Create the audible_message() proc to replace most instance of " for(var/mob/M in hearers(...) show_message(..., 2)" 
fixing typos and missing emotes in emote lists.
 2014-09-14 01:15:15 +02:00
Hornygranny
e36189772a fixes resin runtime, weeds and walls update icons properly on destruction 2014-09-11 14:40:35 -07:00
Cheridan
12a926ae9e Merge pull request #4532 from hornygranny/smoothaliens 
alium update
 2014-09-09 14:54:43 -05:00
Hornygranny
5f33e3d713 old alien sprites, description updates 2014-09-09 11:21:41 -07:00
KyrahAbattoir
20d9e6c2b2 Because aparently we can't have nice things. 2014-09-08 17:26:28 +02:00
Hornygranny
02e527e938 Merge branch 'smoothaliens' 
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/modules/mob/living/carbon/alien/alien.dm
 2014-09-07 21:33:48 -07:00
Hornygranny
c2827a64a0 lowered weeds layer 2014-09-02 10:53:36 -07:00
ikarrus
bf5f5e5922 Resolved Conflicts: 
_maps/map_files/tgstation.2.1.3.dmm
 2014-09-01 22:58:23 -06:00
Cheridan
ed9ef3c3e3 Merge pull request #4583 from JStheguy/master 
NT Poster Port
 2014-09-01 17:49:44 -05:00
Hornygranny
01b01609fe egg click cooldown fixed, HEADCOVERSMOUTH removed from inappropriate items 2014-08-29 16:38:27 -07:00
MrPerson
a23dbe2357 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/events/ninja.dm
	code/modules/power/cell.dm
	code/modules/power/port_gen.dm
	code/modules/reagents/reagent_dispenser.dm
 2014-08-29 04:21:15 -07:00
Hornygranny
72760368b5 fixed icons not changing on wall destruction 2014-08-28 16:33:36 -07:00
Hornygranny
1d61d02af7 qdel 2014-08-28 14:24:40 -07:00
Hornygranny
8b19b2bb38 cleanup 2014-08-28 11:50:02 -07:00
KyrahAbattoir
5a928fd7a1 Replaced all the static items in maintenance by random item spawns. 
Replaced the numerous "copy paste" racks of meson/firesuit/gasmask piles with proper firefighting lockers.
 2014-08-28 13:12:40 +02:00
Hornygranny
c9d13e7aa7 no more hideous smoothtable shit 2014-08-27 18:32:28 -07:00
Hornygranny
04d7d954d2 awful awful table smoothing pasta replaced with smoothwall modification 2014-08-27 17:16:49 -07:00
JStheguy
ae64c526ad Okay yeah some changes 
Error posters link to /tg/ issues page now.
Also syndie revolvers have 7 shots so yeah change because facts
 2014-08-27 07:14:43 -05:00
JStheguy
0dc184004c NT Poster Port 
-Adds all them NTstation posters and the poster subtype system.
 2014-08-26 19:03:03 -05:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Hornygranny
2602aeebc8 aliums 2spukki 2014-08-22 10:13:18 -07:00
ikarrus
0891744c8e Resolved Conflicts: 
_maps/map_files/tgstation.2.1.3.dmm
 2014-08-21 19:47:30 -06:00
MrPerson
d0c97aae72 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/game/gamemodes/cult/ritual.dm
	code/game/gamemodes/nuclear/pinpointer.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/status_display.dm
	code/game/objects/effects/decals/crayon.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/airlock_painter.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/storage/secure.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/mousetrap.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/slime/examine.dm
	code/modules/power/cable.dm
	code/modules/reagents/grenade_launcher.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/recycling/sortingmachinery.dm

Thanks Firecage, this is all your fault
 2014-08-20 05:54:20 -07:00
Swag McYolosteinen
5e696e9cd7 Merge pull request #4374 from kyrahabattoir/DynamicMaintenanceLoot 
Dynamic maintenance loot table and map modification.
 2014-08-18 19:27:02 +02:00
KyrahAbattoir
7fb2e5351b Removed flash from the maintenance loot table. 
set armory_contraband to not spawn duplicates (as it initially was).
 2014-08-18 05:41:52 +02:00
KyrahAbattoir
37f9716fb5 Added loot tables for the maintenance and the contraband locker (removed the map edit for now) 2014-08-18 05:40:15 +02:00
ikarrus
be077176ee Used the gibspawner instead 2014-08-16 19:17:39 -06:00
ikarrus
d56274a4ab Adds Deathsquad to Quick-Create Antagonist Menu 
-Pressing this button will spawn up to 5 death commandos on centcom with a customizable objective
-Added a shuttle console to the ferry that, rather than moving the shuttle, will send a request to admins instead
-Deathsquaddies get an energy shield
-Deathsquad beret will no longer hide head, face, and hair
 2014-08-16 00:40:37 -06:00