cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 00:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,239 Commits 61 Branches 14 Tags
4dc2ccce1f1c2be986bda978bc0dbf611ac83278
Commit Graph

2731 Commits

Author SHA1 Message Date
Cheridan
4dc2ccce1f Merge pull request #3266 from phil235/FireAxeCabineFix 
Fireaxe cabinet hacking now fails if player moves away
 2014-04-02 21:26:37 -05:00
Miauw62
af48fba65e Merge pull request #3247 from Firecage/master 
Mime Backpack
 2014-04-02 20:26:16 +02:00
Miauw62
fc0f56a8c6 Merge pull request #3274 from Aranclanos/DermalPatch 
Added back the dermal patch to the HoS locker.
 2014-04-02 19:46:12 +02:00
Firecage
8e67b38e40 Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-04-02 19:15:56 +02:00
Giacomand
e8d7526a0c Merge branch 'master' of https://github.com/Giacom/-tg-station into sec_maglite 2014-04-02 17:11:52 +01:00
fleure
400971d32b Merge pull request #3250 from MrStonedOne/powersink-admin-spam-fix 
Fix for #3249 (Powersink is about to explode spam)
 2014-04-02 15:53:43 +01:00
Razharas
b700f39509 Merge pull request #3272 from Ikarrus/boxupdate 
[MAP] "Boxstation" v2.1.3
 2014-04-02 05:54:12 -07:00
Aranclanos
449c3655da Added back the dermal patch to the HoS locker. 
For some reason this item keeps getting stealth changes lately.
 2014-04-02 04:50:16 -03:00
Razharas
74b00b88c9 Merge pull request #3243 from GunHog/BLUE_AI_PRIV 
Adds a name and light blue color to AI Private channel on the radio.
 2014-04-01 18:53:29 -07:00
phil235
d58ee721dc Changing user messages to use span class stuff. 2014-04-01 23:06:51 +02:00
phil235
06dcf22a49 Fireaxe cabinet hacking now fails if player moves away 
Removes the ability to run away right after initializing the cabinet hacking with a multitool and still successfully finish the hacking(and seeing the hack message).

Also, playing the relocking sound at the beginning of the hacking instead of the end for consistency with the unlocking hack.
 2014-04-01 22:04:08 +02:00
Firecage
dabe951f56 Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-04-01 12:09:26 +02:00
Aranclanos
6c1150dca3 Merge pull request #3143 from Malkevin/saccult 
Sacrifice Cult
 2014-04-01 02:18:39 -03:00
Firecage
bf3ad41e6d Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-04-01 06:45:10 +02:00
Cheridan
5fce1835b2 Merge pull request #3144 from Ikarrus/borgdebug 
Debugging Cyborgs during Construction
 2014-03-31 18:48:50 -05:00
MrStonedOne
6553980059 Fixes admin message spam, should only warn the admins once. 
Fix for #3143
 2014-03-31 14:42:47 -07:00
Malkevin
0725ba44a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-31 22:17:24 +01:00
Firecage
cd3773450b Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-03-31 20:56:34 +02:00
fleure
cccb3dcf76 Merge pull request #3226 from Giacom/syndicate_fab 
Syndicate Suit Fashion
 2014-03-31 19:35:45 +01:00
Firecage
79797afb6a Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-03-31 18:53:02 +02:00
Razharas
d1fbcf2457 Merge pull request #3227 from fleure/tankfix 
Watertank nozzles no longer delete
 2014-03-31 09:48:57 -07:00
Firecage
af00fd14bf Mimepack 
This is a simple backpack for the mime.
 2014-03-31 17:49:40 +02:00
GunHog
f11294fdbf Adds a name for AI Private in radio.dm. 2014-03-31 00:48:58 -05:00
ikarrus
2de4ffeb31 Committing what I have for now just in case. Also includes the new shuttle door type and added an airlock painter to the CE's closet. 2014-03-29 22:32:35 -06:00
Malkevin
c3552606f1 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 
Conflicts:
	code/modules/mob/mob.dm
 2014-03-29 16:59:14 +00:00
Razharas
6cb3ae5183 Revert "Merge pull request #3142 from Alek2ander/master" 
This reverts commit 6f9b58abce, reversing
changes made to eda7110a23.

Im so sorry aran, so sorry
 2014-03-29 18:02:54 +04:00
Razharas
79d255be20 Merge pull request #3203 from MrPerson/qdel_table 
Make wrenching tables apart not drop the wrench
 2014-03-29 06:24:23 -07:00
Razharas
6f9b58abce Merge pull request #3142 from Alek2ander/master 
pAI remote computer control
 2014-03-29 06:18:22 -07:00
Giacomand
96912ce8dc Changed the replica suit/helmet to the black/red version. 
Changed the description on the uplink datum.
Made all the suit/helmet names lowercase for all the different versions.
Changed the max_w_class to allow the suit to be inserted, won't allow anything else to be inserted due to the can_hold list not being empty.
 2014-03-29 12:42:23 +00:00
fleure
c55ddd9d70 Watertank nozzles no longer delete 2014-03-29 12:35:58 +00:00
Giacomand
9fb84160c8 Replaced all the red syndicate space suits with the red/black version, including the uplink item. It looks cooler. 
You can now put the syndicate suit back into the box it came in.
Gave the DJ Station the orange syndicate suit, looks very nice.
Replaced the syndicate suit in the derelict's singularity engine with the yellow/black engie version.
Replaced the other syndicate suit in the derelict with the red/black version.
Added a red/black space suit to the abandoned mining station, inside the resin corridor, along with a syndicate toolbox.
Moved the xeno suit to the hydro room, on the abandoned mining station. It looked out of place out in the open.
Moved the SWAT helmet on the derelict to the derelict armoury.
 2014-03-29 12:00:23 +00:00
Giacomand
f2bfa3f5d4 Renamed maglite to seclite. 
Refactor'd can_hold and cant_hold to use type paths instead of strings.
Removed an undefined object from the medical belt's can_hold list.
 2014-03-29 11:10:35 +00:00
Giacomand
cc1d87afcf Adds the maglite. Security spawns with it in their sec belts. They have a decent force value and are a little better than the common flashlight. Sprites by Nienhaus. Can be held in the sec belt and the armour vest. 2014-03-29 00:54:50 +00:00
Malkevin
3ff519cefc Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 
Conflicts:
	code/modules/mob/mob.dm
 2014-03-28 10:51:48 +00:00
Razharas
3000586e7b Merge pull request #3216 from Aranclanos/ClickDownRemoval2 
Click cooldown removal take 2
 2014-03-28 02:39:25 -07:00
Aranclanos
7bcb69ad88 Removes the click cooldown from almost everything, now it should be always be 0.1 seconds. 
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
 2014-03-28 06:32:47 -03:00
YotaXP
febfa4d1e5 Merge branch 'qdel-with-datums' 
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/controllers/garbage.dm
	code/game/atoms.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/mob/mob.dm
 2014-03-27 21:46:53 -04:00
Alek2ander
358ecf7e6a Merge branch 'master' of https://github.com/tgstation/-tg-station into tgstation-master 
Conflicts:
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/telecrystalconsoles.dm
 2014-03-27 18:31:11 +04:00
Malkevin
cd6c1272ad Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-27 13:18:46 +00:00
MrPerson
481427a46f Make wrenching tables apart not drop the wrench 2014-03-26 20:34:08 -07:00
ikarrus
c41c80591a Some minor fixes 2014-03-26 12:38:30 -06:00
Malkevin
990ed20873 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 
Conflicts:
	code/modules/mob/mob.dm
 2014-03-26 18:38:07 +00:00
Incoming
e5f0165d0d Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic 
Conflicts:
	code/datums/spells/charge.dm
	code/modules/projectiles/ammunition/special.dm
	code/modules/projectiles/guns/magic/staff.dm
 2014-03-26 13:03:12 -04:00
Aranclanos
211d1ec509 Merge pull request #3173 from MrPerson/cream_of_torium 
Small rewrite of crematorium and morgue so they work right.
 2014-03-26 03:35:55 -03:00
ikarrus
fe8481331c -Added option to force sync to a specific AI 
-Removed option to force a module to load
-Fixed pulsing a cyborg's AI wire not letting it reselect an AI to sync to.
-Resolved Conflicts
 2014-03-25 14:07:01 -06:00
Cheridan
3187be3e51 Merge pull request #3111 from Ikarrus/seclocks 
[MAP] Security Lockers Organization
 2014-03-25 11:00:48 -05:00
MrPerson
52b24f3549 Merge branch 'master' of https://github.com/tgstation/-tg-station into cream_of_torium 2014-03-25 04:42:10 -07:00
Incoming
6b83a8d2e0 I am crying. 
Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue

Conflicts:
	code/game/objects/structures/crates_lockers/closets/statue.dm
	code/modules/mob/living/simple_animal/hostile/statue.dm
	code/modules/projectiles/projectile/magic.dm
	tgstation.dme
 2014-03-24 22:13:43 -04:00
Aranclanos
9e9dc34ecf Merge pull request #3163 from Mloc/tg-eol 
proper crlf forcing
 2014-03-24 22:47:13 -03:00
fleure
43a6e111c5 Merge pull request #3118 from VistaPOWA/cyborg_module_in_telecomms 
Adds the Cyborg module into the messages received by the AI
 2014-03-24 15:08:25 +00:00