cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,888 Commits 61 Branches 14 Tags
64bc2abec38c8207a45891124ee4676e05d7720e
Commit Graph

3027 Commits

Author SHA1 Message Date
paprka
726b939754 whole bunch of gun stuff 2014-08-07 14:39:31 -07:00
paprka
d41a469ff4 Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace 
Conflicts:
	code/game/mecha/mecha.dm
 2014-08-06 15:22:56 -07: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
Aranclanos
0ad9b394d5 Merge pull request #4296 from AndroidSFV/alienwallbuff 
Resin walls and weeds cannot be mash-attacked.
 2014-08-03 21:46:22 -03:00
MrPerson
5b0aba0e67 Merge pull request #4262 from kyrahabattoir/ItemNameFixing07-2014 
Another lowercasing pass on a bunch of items and furnitures.
 2014-08-02 18:02:50 -07:00
Cheridan
c74601646a Merge pull request #4287 from AndroidSFV/taperecorderfix 
Fixes a minor span class in tape recorder
 2014-07-31 22:28:27 -05:00
KyrahAbattoir
1b2c95a81c Merge branch 'master' into ItemNameFixing07-2014 2014-07-31 18:54:38 +02:00
AndroidSFV
817278e5ad Resin walls and weeds cannot be mash-attacked. 2014-07-30 21:04:34 -05:00
Alex
589d38660a Merge pull request #3967 from CollenN/radscanner 
Adds Radioactive Microlaser to Traitor Arsenal
 2014-07-30 10:13:10 +01:00
paprka
eea9ae50ad merging 2014-07-29 16:50:21 -07:00
AndroidSFV
99e7957db0 Fixes a minor span class in tape recorder 2014-07-29 14:59:51 -05:00
paprka
d992c907c6 goodbye rigsuits my old friends 2014-07-29 11:43:34 -07:00
paprka
056289a273 fixed moving between adjacent tables 2014-07-29 09:12:01 -07:00
KyrahAbattoir
fcb2fb9de3 Another lowercasing pass on a bunch of items and furnitures. 
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
 2014-07-27 19:14:40 +02:00
Firecage
2df25335e2 You cannot instant wrench dislodged girders. 2014-07-26 23:25:01 +02:00
Alex
e4de28b13e Merge pull request #4170 from RemieRichards/FixDoorLockerWeld 
Fixes Permanent Airlock welding, adds sound to dismantling a locker
 2014-07-22 15:18:32 +01:00
Alex
172322c0ad Merge pull request #4192 from paprka/sleepyfix 
Fixes miauw's parapen laziness
 2014-07-22 15:16:46 +01:00
Alex
07267b4220 Merge pull request #4208 from paprka/tfwnogrille 
Grille hitting text fix.
 2014-07-22 08:02:55 +01:00
paprka
9747d26081 you no longer kick grilles 2014-07-20 22:58:48 -07:00
Firecage
7779a2f7e8 Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-20 21:10:53 +02:00
paprka
3bf4ecfba5 fixes laziness 2014-07-18 18:30:23 -07:00
Firecage
fc4c299252 Lighting cigarettes with flares/torches 
Signed-off-by: Firecage <firecage@hotmail.com>
 2014-07-16 16:34:42 +02:00
Robson Richards
fdadd6ad86 Fixes Permanent Airlock welding, adds sound to dismantling a locker 2014-07-16 00:45:38 +01:00
Alex
cf7c466779 Merge pull request #4144 from Rockdtben/securityPDA 
PDA - Security Records were missing tables.
 2014-07-14 14:17:11 +01:00
Alex
72423a7bd0 Merge pull request #4059 from Miauw62/goodbyeparapen 
Replaces the parapen
 2014-07-14 12:47:14 +01:00
Miauw
9173a46bfd Makes C4 unable to be planted on mobs and reduces C4 cost to 1 TC 2014-07-14 13:28:42 +02:00
Alex
eddcde41a8 Merge pull request #4135 from Rolan7/Issue_1919 
Fixes tray layer issue
 2014-07-14 09:26:05 +01:00
Rockdtben
0e26850893 PDA - Security Records were missing tables. 
Fixed a bug where printing would stop working if a record was deleted.
 2014-07-12 20:54:47 -05:00
Rolan7
d567d23be8 Changes the layer for items on trays to -1. This makes them display on top of the tray, but not above other things. 2014-07-11 22:17:03 -04:00
paprka
7a853c5f86 round 2 2014-07-10 20:24:49 -07:00
paprka
b92397a2e3 paprikkas gay 2014-07-10 20:12:24 -07:00
Cheridan
0aae810b87 fixes merge issue with killer tomatoes 
fixes soap
 2014-07-07 13:59:59 -05:00
Cheridan
065028cf1d Merge branch 'master' of https://github.com/tgstation/-tg-station into ghost_notifications 
i am going to murder you miauw
 2014-07-07 12:51:56 -05:00
CollenN
7b90557dea ..() 2014-07-07 13:46:59 -04:00
Alex
8e883deff7 Merge pull request #4057 from Aranclanos/OfficeChairs 
Rolling chairs fixes.
 2014-07-07 10:27:03 +01:00
Alex
f88b6a6c4d Merge pull request #4069 from AstralSerpent/borgment_harmweldhertz 
Using a welding tool on augmented limbs, cyborgs or bots will hurt while on harm intent, instead of heal.
 2014-07-07 10:25:45 +01:00
Ben G.
d497387355 Merge pull request #4048 from Kelenius/OfAIAndHUD 
Gives the AI a simple hud
 2014-07-06 12:58:13 -05:00
Kelenius
e9d2124220 usr -> user 2014-07-06 21:33:05 +04:00
ikarrus
81e9431c64 Resolved Conflicts: 
_maps/map_files/tgstation.2.1.3.dmm
 2014-07-06 10:37:05 -06:00
CollenN
92cd196731 Stuff 2 2014-07-06 08:54:07 -04:00
CollenN
ae0be09cba Stuff 
Stuff: The Commit: The Update
 2014-07-05 22:53:19 -04:00
AstralSerpent
10c9d4d14e Attacking augmented limbs or cyborgs with a welder on harm intent will actually harm. 2014-07-06 02:33:13 +10:00
Aranclanos
5c03b51879 Office/rolling chairs will now work properly when carrying mobs, those will not slip out of the chair, becoming an ungrabless mobs. And the direction of the chair and mob will be better and easier to notice when they bump something. 
Their direction changes will work even better if mob movement code finally removes all the spawn() calls. I'm not planning of adding any special code for that here.
 2014-07-04 04:46:32 -03:00
Cheridan
52c9abbd27 Growns: The OOPening. 
Refactors grown.dm to use OO programming techniques.

merge commit

conflict in map

map fix

fixing the map. again. thanks obama.

map commit

wtf

Merge branch 'master' of https://github.com/tgstation/-tg-station into ghost_notifications

map conflict fix. this should work.

updates metastation
 2014-07-03 16:43:07 -05:00
Alex
a68c426301 Merge pull request #4038 from Cheridan/ghost_notifications 
Notifications + Random Stuff
 2014-07-03 17:29:49 +01:00
Kelenius
d8ae776f64 Gives the AI a hud 2014-07-03 18:52:11 +04:00
Alex
78679366a7 Merge pull request #4030 from Aranclanos/singforthemoment 
fixes issue #4025 - service borg violin not working
 2014-07-03 13:43:20 +01:00
Cheridan
d34f9fd02e Merge pull request #3946 from RemieRichards/16/06/2014-AirlockWelding 
Airlocks and Lockers take time to weld and unweld
 2014-07-01 23:22:51 -05:00
Cheridan
b02b93ce2a Notifications + Random Stuff 
Adds sound notifications for Ninja and Wizard Apprentice spawning -- hopefully means fewer afk antags.

Adds a ghostnotice span class, used in the new notify_ghosts proc. Upon creation, things that require ghostly attention (NarSie, golem runes) give more visible messages to the dead.

Retires the 'moderate' span class, which was only used in tomato throwing? Refactors tomato code (this ended up being the meat of this PR, somehow...)

Reorganizes some item definition/procs.
 2014-07-01 23:16:02 -05: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