cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 08:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,054 Commits 61 Branches 14 Tags
b9efeaa9323ef84f59f227ebc1b21889d477ddef
Commit Graph

300 Commits

Author SHA1 Message Date
Cheridan
b9efeaa932 Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3 
Item name fixing round3
 2013-12-26 23:14:15 -08:00
Miauw
0338a66c2a Adds fingerprints to a bunch of stuff. De-texts computer build paths. 2013-12-22 18:57:33 +01:00
Aranclanos
58d0ed5221 Merge pull request #2094 from RobRichards1997/19/12/2013-Sec-see-Sec-Sprites 
Security Sprite updates.
 2013-12-21 15:24:14 -08:00
Aranclanos
e7579e2aa8 Merge pull request #1986 from Perakp/janitorCartFix 
Fixes janiborg interaction with janicarts
 2013-12-21 15:01:37 -08:00
Giacom
5fb0d05dd1 Merge pull request #2096 from Aranclanos/SweetLindaNobodyWillTouchYou 
Small fixes for Linda.
 2013-12-21 13:57:15 -08:00
Perakp
c40af6ae40 Update icons after item is placed in cart. 2013-12-21 09:50:15 +02:00
Perakp
65e0931d55 Merge branch 'master' into janitorCartFix 
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
 2013-12-21 09:40:06 +02:00
Aranclanos
213f3fff31 Some fixes for Linda, now the Move() proc of objects that block air is different. Example below. 
object/Move()
   var/turf/T = loc
   ..()
   move_update_air(T)
 2013-12-19 22:13:21 -03:00
Robson Richards
f8c05e2169 Security Sprite updates. 
Replaces all instances of the old Swat and riot sprites with Validsalad's new ones
Replaces Sechailer's with Officer, Warden and HoS versions code and Sprites wise (Sptires by Validsalad again)
The officer gas mask is gas/sechailer, the warden's is gas/sechailer/warden and the HoS's is gas/sechailer/hos
 2013-12-19 23:14:51 +00:00
Razharas
1ce0b11b0d Fixes morgue trays used by ghosts and what not 2013-12-19 00:23:36 +04:00
Perakp
68ff764463 Subtypes of janiborg tools 
- The other way of fixing it. I’m not sure why this is better.
- Removed condescending messages to cyborgs.
 2013-12-18 20:44:24 +02:00
Cheridan
86ad35374e Merge pull request #2010 from JJRcop/transit-tube-interaction 
Adds functionality to empty a transit pod or put mobs in one
 2013-12-15 07:23:43 -08:00
JJRcop
a3a1aa952d New way to prevent saxxing in transit tubes to run from the law 2013-12-14 18:23:15 -05:00
Perakp
088b5afe93 Following code standards 
- One statement per line.
 2013-12-14 17:49:51 +02:00
JJRcop
d2eee6572e Adds and removes some checks in transit tubes 
Adds some safety checks when stuffing people in transit tubes
Removes intent check when yanking people out of tubes because it complicates things
 2013-12-13 21:18:09 -05:00
JJRcop
c80efcc0f0 Adds breaks to some loops in case there is more than one pod. 
Shouldn't happen, but Murphy's law.
 2013-12-11 10:50:03 -05:00
Kyrah Abattoir
3496dc4e0a Merge branch 'master' into ItemNameFixingRound3 2013-12-10 17:32:45 +01:00
JJRcop
db94963933 Adds functionality to empty a transit pod or put mobs in one 
Clicking on a transit station with a grab or harm intent will cause you to attempt to empty the contents of the pod onto the floor, takes 4 seconds

Clicking on a transit station with a grab item in the aggressive state or above will cause you to attempt to stuff the grabbed mob into the pod, takes 6 seconds
EDIT1: Caused stuffing people in pods to stun them for 5 seconds to assist transport of captured persons
 2013-12-09 21:02:50 -05:00
Incoming
3432aaf583 Adds a christmas tree to the bar 
Adds a festivus pole to the science break room
Adds a santa outfit to the captains office so he can spread cheer to the crew
 2013-12-08 13:23:55 -05:00
Giacom
c1304ef0c8 Merge pull request #1971 from adrix89/Crate_Explostion 
Fixed crate not blowing up properly.
 2013-12-07 04:54:09 -08:00
Perakp
e4c3ca5fb8 Janiborgs can no longer place their mop, light replacer or trash bag in the janicart. Fixes #1954 
Language fix "this the" -> "the" in storage.dm
 2013-12-06 13:00:11 +02:00
adrix89
49282cd604 Fixed not blowing up properly. 
Use closet ex_act instead.
 2013-12-04 10:03:12 +02:00
Jordie0608
503d0b76ab Recommit from clean 2013-11-26 05:23:43 +11:00
Giacom
d7b6001f98 Merge pull request #1835 from Cheridan/NukePR 
Scale Ops 1.1
 2013-11-24 13:51:07 -08:00
Kyrah Abattoir
d9fc4bdd5c code/game/object/items/weapons/* lowercase pass 
code/game/object/structure/* lowercase pass (start)
 2013-11-24 08:49:34 +01:00
Giacomand
17fd5d6cdc * Fixes certain objects not using 3D sounds. 
* Gave the piano a bigger falloff.
 * Capped the sound x/z to 7.
 2013-11-21 23:50:53 +00:00
Cheridan
d814414227 Scale Ops 1.1 
Reduces the costs of some items based on feedback.
Op lockers now start with a new miniaturized jetpack.
 2013-11-20 17:59:02 -06:00
Aranclanos
ab566551af Merge pull request #1789 from havocx42/WindowPush 
Attacking unanchored windows with a wrench turns them into stacks of glass
 2013-11-20 11:19:16 -08:00
havocx42
a4e71ce1c0 Removed ..() from Del proc 2013-11-20 09:02:37 +00:00
Cheridan
bae3bcff3b Merge pull request #1801 from Giacom/explosion_sound 
3D Sounds + Rewrote the explosion sound to be more optimized and to be more dynamic.
 2013-11-19 15:49:45 -08:00
Laurence Reading
92c0f666f7 When removing a window the Deconstruct sound is played instead of shatter 
Adds the ..() call to del()
 2013-11-19 13:15:54 +00:00
Giacomand
c012a7aee3 Changed playsound() to use less code. Playsound now loops through the player list, which means you do not have to check inside closets/objects/other mobs to play sounds. 
Made all sounds use 3D sounds! This includes sounds which have less volume the further away you are from it.
The piano now uses 3D sounds.
Changed how the far explosion sound is calculated.
 2013-11-18 14:38:49 +00:00
Giacom
fc1211f1b4 Merge pull request #1803 from kyrahabattoir/examine-cleaning 
Examine cleaning
 2013-11-17 13:12:09 -08:00
Giacom
583cdb1781 Merge pull request #1763 from fleure/medmech 
Fixed some container escape issues
 2013-11-17 13:10:53 -08:00
Kyrah Abattoir
560b50ec1b Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using. 
Added superclass invoke for the arcane tome

Added superclass invoke to light switches, removed it's (unused) description.

FLightswitch description repetition derp

examine superclass invoke for gas flow meter, space heater, fire extinguishers, grenades/IEDs, fancy boxes and welder. Changed description for welder and fire extinguisher to show their content in a similar style.

Fixed tank, linen bins and janicart description, and added welder of previous commit (forgot to commit it)

REMOVED icon in mop_bucket description (now provided by item class).
REMOVED unused examine() override in clothing/gloves
REMOVED custom examine() for glass/rag
CHANGED using examine superclass on paperwork/paperbin, removed redundant description code
CHANGED examine superclass for power/apc
ADDED universal maxcharge readout for all the powercell types.
CHANGED using examine superclass on machinery/light, removed redundant description code

FIXED weapon/virusdish use a description field.
TWEAK lowercased some of the portable generators.

Fixed improperness of pacman names
 2013-11-16 22:15:50 +01:00
Fleure
ecc10f6aea Refactored big package attack code 2013-11-16 20:56:23 +00:00
havocx42
be44497a09 removing unnecessary "/" from variant declaration 2013-11-14 22:54:23 +00:00
Laurence Reading
d753d524c2 Attacking unanchored windows truns them into stacks of glass 2013-11-14 22:17:01 +00:00
Fleure
05d5933137 Fixed being able to escape moving lockers 2013-11-14 18:42:13 +00:00
Aranclanos
2295080ea3 Merge branch 'medmech' of https://github.com/fleure/-tg-station into medmech 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
 2013-11-09 15:14:48 -03:00
Miauw
5ad9505ef4 [MAP]Fixed space-fastening properly. 
Conflicts:
	code/modules/power/singularity/field_generator.dm
	maps/tgstation.2.1.2.dmm
(What is this I don't even)
 2013-11-09 14:42:54 +01:00
Miauw
58f021626b Cleaned up bugfixes. Committed musician.dm too, I accidently forgot that. 2013-11-09 14:11:40 +01:00
Fleure
aaf68d2a12 Included additional structures to escape from 2013-11-05 00:26:30 +00:00
Cheridan
637e7f72c9 Nuke Op Population Scaling and Content Update 
to be edited
 2013-11-03 16:41:57 -06:00
sirbayer
c6c1dbd363 Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-improvedprojectiles 2013-11-01 20:32:04 -07:00
sirbayer
19e51caef0 Modification of .gitignore to include admins.txt. Hopefully.` 
Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

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

Conflicts:
	config/admins.txt

stuff

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

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

Conflicts:
	config/admins.txt

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

Conflicts:
	config/admins.txt

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

Conflicts:
	config/admins.txt

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

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

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

latest setting for tgstation.dme

deeply do I loathe these files

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

Conflicts:
	config/admins.txt

God I hate gitignore

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

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

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

Conflicts:
	config/admins.txt

stuff

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

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

Conflicts:
	config/admins.txt

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

Conflicts:
	config/admins.txt

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

Conflicts:
	config/admins.txt

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

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

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

latest setting for tgstation.dme

deeply do I loathe these files

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

Conflicts:
	config/admins.txt

God I hate gitignore

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

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

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

Conflicts:
	config/admins.txt

stuff

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

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

Conflicts:
	config/admins.txt

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

Conflicts:
	config/admins.txt

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

Conflicts:
	config/admins.txt

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

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

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

latest setting for tgstation.dme

deeply do I loathe these files

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

Conflicts:
	config/admins.txt

God I hate gitignore

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

Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles

Conflicts:
	config/admins.txt
	data/investigate/singulo.html

I don't what I'm doing

Massive overhaul to automatic gun functionality, intended primarily to
allow partially-filled magazines to be released.

Now it compiles and doesn't throw runtimes! Also chambering rounds works
right! Unfortunately the contents still need to be looked at, the Russian
Revolver isn't working, and the Bartender's shotgun is just a nightmare.
Also you still can't eject mags.

Mags eject, most gun work. Shotguns still have a problem with reloading
and chambering. Russian Revolver is a bitch.

Heavy finalizing touches. Fixed references to changed trees. Added
icon_states for some magazines. Fixed revolver glitches and subtyped
double-barreled shotguns to revolvers to fix its glitches. Made bullets
and spent shells more obvious via graphical changes. Probably did some
other things but I can't think of what they'd be.

Sprite tweaks for final preparations for pull request.

final FINAL finalizations.

Adding full paths to overwritten procs for simplicity's sake.

Fixing damaged .gitignore and config/admins.txt.

Finalization for pull preparation. Clean up some descs, eliminate data folder.
 2013-10-30 17:56:00 -07:00
Aranclanos
2888ade897 Merge pull request #1655 from Giacom/robot_violin 
Added the space violin to the service cyborg modules + MORE [CHANGELOG]
 2013-10-30 08:19:22 -07:00
AndroidSFV
3144b54e92 Fixes #633. Problem was a null.loc runtime from the chair being disassembled. 2013-10-27 19:37:38 -05:00
Fleure
d4aa482ff1 Changed locker escape message usage 2013-10-26 20:07:26 +01:00
Giacomand
83b882ed3f * Added the space violin to the service cyborg modules. 
* Made the space violin usable by service cyborgs.
* You can now examine Cyborgs to see their active module.
* Made the choose module window look nicer.
 2013-10-26 13:49:41 +01:00