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
13,356 Commits 61 Branches 14 Tags
eae6cdbe96cb93e2f8e6efb22c7fd2ef3a964a7f
Commit Graph

525 Commits

Author SHA1 Message Date
Lo6a4evskiy
eae6cdbe96 The rest of the junk 2014-09-05 18:14:02 +04:00
Alex
53d9aca271 Merge pull request #4371 from paprka/bowmanheadsets 
Bowman radio headsets
 2014-08-11 14:13:26 +01:00
paprka
e901f9b6c1 bowmans 2014-08-07 12:30:14 -07:00
paprka
10f6ca8c7e removes swat helmet 2014-08-07 04:47:55 -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
paprka
eea9ae50ad merging 2014-07-29 16:50:21 -07: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
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
paprka
9747d26081 you no longer kick grilles 2014-07-20 22:58:48 -07:00
Robson Richards
fdadd6ad86 Fixes Permanent Airlock welding, adds sound to dismantling a locker 2014-07-16 00:45:38 +01:00
Alex
8e883deff7 Merge pull request #4057 from Aranclanos/OfficeChairs 
Rolling chairs fixes.
 2014-07-07 10:27:03 +01: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
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
Aranclanos
e47095d376 fixes issue #4025 
the song datum will now use properly the canUseTopic() proc
 2014-07-01 00:00:40 -03:00
Robson Richards
96354bb56d Lockers now take 40 ticks to weld + Sounds + Feedback messages 
Minor reformat of code for Locker welding
 2014-06-19 16:13:10 +01:00
Kelenius
cd4be00d3b Fix 2014-06-19 02:48:37 +04:00
Kelenius
a8b7588c12 Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp 
Conflicts:
	code/game/objects/items/weapons/grenades/ghettobomb.dm
	code/game/objects/structures/door_assembly.dm
 2014-06-19 02:27:10 +04:00
Alex
8171c40300 Merge pull request #3915 from phil235/AirlockAssemblyF 
Fix for #3871
 2014-06-16 10:38:12 +01:00
phil235
6d1bfb9244 removing !src checks 2014-06-13 19:38:15 +02:00
ikarrus
df285ff7b3 Resolved conflicts: 
code/modules/mob/mob.dm
 2014-06-13 09:04:30 -06:00
phil235
2f03f0fabd Door Assembly exploit fix 2014-06-12 23:06:42 +02:00
Kelenius
698fde12f4 Two small bugs... 2014-06-13 01:01:10 +04:00
Alex
9c6ac5c5f7 Merge pull request #3818 from phil235/ChameleonMimeFix 
FIx issue #3692
 2014-06-12 10:34:41 +01:00
Kelenius
3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
ikarrus
b1f050e63a Adding fingerprints to actions: 
-breaking windoors
-wrenching/unwrenching pipe dispensers
-locking/unlocking crates
-breaking grilles
-smashing windows
-deconning walls
 2014-06-04 22:30:46 -06:00
ikarrus
4905beb67e Removes hacky code in favour of a process() check for the nuke disk's location 
Instead of having a lot of hacky checks to prevent the disk from leaving the Z-level, it will be checked periodically by process() if Z > 2
 2014-05-30 22:01:20 -06:00
phil235
2ebf4f57e5 under/det into under/rank/det 2014-05-31 00:38:53 +02:00
ikarrus
82b861702f Resolved Conflicts: 
code/modules/mob/living/simple_animal/constructs.dm
 2014-05-25 10:59:08 -06:00
phil235
a5a91eaffc Fixes unwrenching noise 2014-05-24 19:34:06 +02:00
Rolan7
a36afba82a Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue236_Trays 
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm (The map was deleted)
	code/game/objects/items/weapons/kitchen.dm (Someone fixed up tray attack code a little, whereas I moved trays to a subclass of bags and made the attack code very simple by comparison.  Went with my solution.)
 2014-05-18 20:50:38 -04:00
Cheridan
36bb032957 Merge pull request #3509 from Cheridan/MeteorsSuck 
Meteor Stuff
 2014-05-17 18:42:16 -05:00
ikarrus
8c1e1e1423 Resolved stupid map conflicts 2014-05-15 09:12:47 -06:00
Alex
bcac0812c5 Merge pull request #3585 from Aranclanos/ViolinAndPiano 
canUseTopic()
 2014-05-14 11:05:17 +01:00
Alex
084510a743 Merge pull request #3391 from Donkie/sofa 
Sofa / Comfychair update
 2014-05-14 10:37:06 +01: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
ikarrus
61b156a07f Added attack cooldowns to a few objects 
Includes:
-Fire axe cabinets
-Captain's display case
-RD's lab cage
 2014-05-10 12:10:41 -06:00
ikarrus
fd4a0c86eb -Added an auxiliary storage compartment in SSUs to store one item 
-Moved CE's magboots and captain's jetpack into them
-Updated it so that any mob can be placed inside the SSU now. Including Corgis.
 2014-05-08 22:53:10 -06:00
Rolan7
f2493b4c37 Makes trays a subclass of bag. 
This somewhat changes how items are placed on them, but for the better as it's more consistent with existing mechanics.
Hitting someone with the tray still scatters the contents around!  Works on nonhumans.
Placing icons on the tray still makes them show up on the tray.  Using the tray on a table now places the items onto the table, or places the tray itself if it's empty.  Robots can't lose their tray this way, I checked.
Service borgs can actually use their tray to carry things!  Trays can hold all sorts of stuff, as long as it's small...
A service borg can carry the nuke disk around.  The pinpointer does follow it correctly.
If the service borg stashes its tray module, dies, explodes, gibselfs, or is forced to stash its modules by damage, it drops all the tray's contents on the ground.

Fixes #236 (service borgs can't use trays) and #2991 (Items on food trays can't be picked up).  Didn't address #1919, the layer issue.

Fixes the "bajillion lines changed" with the maps.
 2014-05-07 13:04:22 -04:00
ikarrus
b215db8b76 Suit Storage Units 
-Added them around the station, replacing the ones that were just on racks (e.g. Engineering hardsuits, Captain's, etc)
-Removed their object verb. You can now just click drag yourself to climb in
-They now use the new fancy window colors
-Updated Minisat Maint a little bit to give the wall a bit more width around the SMES units. Shouldn't be so much of a vulnerability any more
 2014-05-06 22:18:30 -06:00
Cheridan
bd2756c36a Merge pull request #3580 from argoneuscze/fixshowerfire 
Fix shower not extinguishing fires
 2014-05-06 19:46:57 -05:00
Cheridan
9ae36480b2 Merge pull request #3618 from kyrahabattoir/ItemNameFixingRound4 
More name fixing, lowercasing objects, proper-ing unique objects, plural...
 2014-05-05 11:46:35 -05:00
Alex
6d337e760b Merge pull request #3592 from Aranclanos/reisinsuperconductivity 
Reisin walls and doors will now block superconductivity (heat)
 2014-05-03 23:11:13 +01:00
Miauw62
eec72aa516 Merge pull request #3472 from Menshin/missing_nodrop 
Nodrop  checks for several machines/structures
 2014-05-03 15:44:26 +02:00
Alex
b3b54d2561 Merge pull request #3607 from phil235/WindowDestroySoundFix 
Fixes the lack of sound when smashing window
 2014-05-02 17:40:37 +01:00
Kyrah Abattoir
997e1310c5 More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it. 2014-05-01 23:07:35 +02:00