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
13,971 Commits 61 Branches 14 Tags
3fca874ea3ea2026b9c08f784bc11fa715da660d
Commit Graph

202 Commits

Author SHA1 Message Date
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
Perakp
3f451f9b1b Warning cones can be worn on your head, with original codersprites. 2014-09-19 22:44:59 +03: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
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
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
Firecage
22743b77f4 Adds asbolute paths to some effect files. 2014-08-07 18:59:06 +02:00
Aranclanos
ccae5781c5 added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines. 
Added melee click cooldown for paper spam on cameras.
 2014-08-03 22:14:56 -03:00
AndroidSFV
817278e5ad Resin walls and weeds cannot be mash-attacked. 2014-07-30 21:04:34 -05:00
Firecage
7779a2f7e8 Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-20 21:10:53 +02:00
ikarrus
a89054dfaa Resolving Conflicts: 
_maps/map_files/tgstation.2.1.3.dmm
	code/controllers/configuration.dm
	config/game_options.txt
 2014-07-01 13:31:08 -06:00
Aranclanos
c65aa2b5a4 Merge pull request #4000 from Cheridan/terribleidea 
MONKEY MODE REDUX
 2014-06-30 16:27:22 -03:00
ikarrus
bf5200daf8 [Config] Security Officer Scaling 
Intended for high-population servers

Open security officer positions scale with population, between 5 slots at ~40 players to 12 slots at ~96 players

Default coefficient is 8, but may be modified (or disabled) in the config.

Extra lockers will spawn if there aren't enough lockers.
 2014-06-15 21:24:07 -06:00
Cheridan
352d5a5627 MONKEY MODE REDUX 
AHUAHEUAHUHEGUEHGAUHEGUAEH

monkeys will now possibly transfer all diseases on bite because that's how diseases kinda work
 2014-06-14 21:30:25 -05:00
Cheridan
b80e9eda57 Nar-Sie update 2014-06-11 14:19:58 -05:00
Cheridan
3a0bd3de28 Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck 
Conflicts:
	code/game/turfs/simulated/walls.dm
 2014-05-13 14:03:42 -05:00
fleure
e13ab9422d Merge pull request #3610 from Aranclanos/washingmachine 
Washing machine fixes
 2014-05-13 16:55:26 +01:00
Aranclanos
b544a945a9 Fixes issue #2489 
Fixes issue #119

Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX
Added two extra options to the spawn menu of the game panel, clothing and food.
 2014-05-01 06:01:14 -03:00
Aranclanos
cc34aae3e3 Reisin walls and doors will now block superconductivity (heat) 
Reisin membranes won't
 2014-04-30 07:40:41 -03:00
VistaPOWA
19402bd258 Handle alpha 0 2014-04-27 15:57:18 +02:00
VistaPOWA
fcf98c15f9 Checking for divide by zero 2014-04-27 14:41:53 +02:00
VistaPOWA
4c7cbeff08 Fixes bad indent 2014-04-27 14:34:52 +02:00
VistaPOWA
14ad291ba2 Merge remote-tracking branch 'upstream/master' into smoke_fade 2014-04-27 14:16:55 +02:00
VistaPOWA
5a197e8dec Adds a fancy fade-out for smokes 
Originally from Bay.
Made by Loganbacca, ported by me.
 2014-04-27 14:16:50 +02:00
fleure
a3b01d017e Merge pull request #3495 from phil235/CocoonattackedmsgFix 
Fix for #3151
 2014-04-23 15:12:38 +01:00
Cheridan
f83f1932b2 Meteor code uses OOP principles a little better now 
Adds new types of meteors with different effects.
Meteors drop some ore when they hit.
 2014-04-23 01:37:44 -05:00
phil235
382397a6ea Fix for #3151 
Removes the useless periods.
 2014-04-21 19:36:33 +02:00
Aranclanos
fc915bf800 If you try to use the teleporter and the teleport was rejected for any reason (like having a nuclear disk), you won't get the chance to get a random damage from the teleport. 
Fixes issue #2236.
Removed some spawn() calls.
Removed the chance of fail from the portal effects (the blue portals made with hand teleporters).
The portal datums will now return 0 if the teleport failed, and now use a new proc, start(), instead of New() to handle themselves.
Standarized teleport.dm from the helper_datums folder.
Removed the checks for centcomm z level and away missions z level for teleports. Now you can go there.
changed the /red messages from the teleports datum to span classes.
The "[something] bounces off of the portal!" were replaced for "The portal rejects [something]".
Removed an extra "the" on those messages.
 2014-04-02 08:36:33 -03:00