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
22,310 Commits 61 Branches 14 Tags
99c5d75cef2454dce3279c2d2d080da29517c2d0
Commit Graph

1435 Commits

Author SHA1 Message Date
KorPhaeron
99c5d75cef Adds check for firer being null 2015-07-20 06:07:17 -05:00
KorPhaeron
65f56e146d Liberty Station fix, alien whispering fix, plasma statue logging. 
Fixes the liberty station spawning an SMG without a firing pin by
creating an unrestricted variant of it. Added unrestricted L6 and
unrestricted bulldog object types for admin spawn since I was already
there.

Fixes aliens being able to whisper to ghosts.

Adds logging to shooting plasma statues.
 2015-07-19 10:31:52 -05:00
Cheridan
a4a7c21744 Merge pull request #10653 from phil235/Fixarino 
Three simple fixes again
 2015-07-17 15:49:41 -05:00
Cheridan
41890b2845 Merge pull request #10637 from phil235/ShowerBurnFix 
Shower Fix
 2015-07-17 15:34:29 -05:00
phil235
7cd4a09ed7 Merge pull request #10592 from AlexanderUlanH/tables 
Brings Tabling in line with newer stuns
 2015-07-16 19:38:14 +02:00
phil235
9463dd7e70 Merge pull request #10613 from Ikarrus/rwindow-heat 
Reinforced windows and windoors are a bit more resistant to fires and blasts
 2015-07-16 18:42:45 +02:00
phil235
e968c9e03c Fixes dog bed dropping metal on deconstruction. 
Fixes damp rag smothering not giving a bold red message to the victim.
Fixes curare not properly weakening mobs.
 2015-07-16 13:04:44 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
5f7afb8782 Let's not spam people with drenching messages. 2015-07-15 20:08:53 +02:00
phil235
5a78777daf Changed carbon/clean_blood() to carbon/human/clean_blood() and moved it from carbon.dm to human.dm since it only did stuff for humans. 
Fixes showers not being processed correctly, especially for mobs. (processing will a bit more intensive unfortunately)
Fixes showers not cleaning bloody human hands.
Remove the now unused checkeyes() proc.
 2015-07-15 19:49:23 +02:00
Ikarrus
2bc5fd2db9 Reinforced windows and windoors are a bit more resistant to fires and blasts 
- Regular windows/windoors: 1073k
- Reinforced windows/windoors: 1873k
- Reinforced windows/windoors will count as walls for blast range calculation (The lowest possible value)
 2015-07-13 23:31:34 -06:00
Alexander P. Ulan Hernandez
d7ee8b9032 Might as well fix this while there's a more controvercial PR 2015-07-13 08:51:37 -04:00
Swag McYolosteinen
81ec442d50 Merge pull request #10512 from duncathan/traygoggles 
Adds t-ray scanner goggles for atmos techs
 2015-07-12 12:41:37 +02:00
xxalpha
bd6ebcbd69 Fixed nest overlays being deleted when unbuckling a mob. 2015-07-11 02:20:50 +01:00
xxalpha
4b5659cbf2 what the fuck was I thinking with this one 
Negative layers
 2015-07-10 19:58:50 +01:00
xxalpha
1746e86ed8 Merge remote-tracking branch 'upstream/master' into smoothballs 2015-07-10 19:19:43 +01:00
Remie Richards
f7faf4d730 Merge pull request #10487 from MrStonedOne/attacklogcleanup 
Attack logging tweaks/cleanup
 2015-07-10 18:42:08 +01:00
duncathan
5bfaff9879 adds tray goggles 2015-07-10 03:35:56 -06:00
xxalpha
942b4fd790 Fixed false walls incorrect icon update. 
Enabled mineral false walls.
 2015-07-09 17:17:24 +01:00
Jordie
6f2da10dd2 Merge pull request #10461 from Iamgoofball/patch-96 
Security Lockers now start with Security Helmets.
 2015-07-09 20:45:56 +10:00
MrStonedOne
a262f9aac7 Attack logging tweaks 
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
 2015-07-08 23:14:37 -07:00
xxalpha
e0f2b93089 Merge remote-tracking branch 'upstream/master' into smoothballs 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-07-09 02:40:21 +01:00
xxalpha
18d8cedf9b Transformed the datum into isolated procs. 2015-07-09 02:38:30 +01:00
Swag McYolosteinen
d826a19f81 Merge pull request #9934 from nukeop/rcd 
Makes RCDs more useful
 2015-07-08 16:03:31 +02:00
xxalpha
7dcf3623e5 Removed image instantiation for faster smoothing. 2015-07-08 02:17:16 +01:00
xxalpha
e7a90863b7 Repath grass. 2015-07-08 02:06:14 +01:00
Iamgoofball
fe7defded4 Security Lockers now start with Security Helmets. 
They have everything else, but no security helmets.

This made no sense.
 2015-07-07 16:18:01 -07:00
xxalpha
b74a65ff8a Working rwall decon icons, map editor iconstates, all smooth. 2015-07-07 22:17:25 +01:00
xxalpha
0b906c6916 All walls, fakewalls, windows, carpet. 2015-07-07 19:50:31 +01:00
Cheridan
7b6867bc21 Merge pull request #10328 from Ikarrus/datumgangs 
Datum-Based Gangs [Ready]
 2015-07-03 10:35:07 -05:00
Razharas
d03006d17b Merge pull request #10304 from TheVekter/dogbedwoofwoof2 
Replaces the crate in HoP's office with a dog bed
 2015-07-03 04:27:48 +03:00
Ikarrus
25b134581b Resolved Conflicts: 
code/game/gamemodes/gang/gang_pen.dm
 2015-07-02 15:15:41 -06:00
Ikarrus
2191a2c33d Datum-Based Gangs 2015-07-02 15:12:55 -06:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up 
cant wake up

go to sleep debug
 2015-07-01 03:34:47 +01:00
TheVekter
053affa6e3 Replaces the crate in HoP's office with a dog bed 2015-06-30 19:30:41 -05:00
Cheridan
87cd31c11f Merge pull request #10211 from Ikarrus/burntweaks 
Destructible Clothing Tweaks and Fixes
 2015-06-29 21:38:20 -05:00
Cheridan
3b4dbc4f27 Merge pull request #10216 from nukeop/syndiesurgerybag 
Add Syndicate surgery bag to uplink
 2015-06-29 15:52:55 -05:00
Ikarrus
4f4b8f1774 Merge branch 'master' of https://github.com/tgstation/-tg-station into burntweaks 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
 2015-06-28 19:00:16 -06:00
Cheridan
5fc029d63d Merge pull request #10215 from Ikarrus/freetheclothes 
[Box, Meta, Mini] Moves clothes from out of equipment lockers and into wardrobe closets
 2015-06-28 18:16:04 -05:00
Ikarrus
d07e315ddf Squashed 2015-06-28 12:11:05 -06:00
Ikarrus
c08cfb8018 Merge branch 'master' of https://github.com/tgstation/-tg-station into gangnerf 
Conflicts:
	code/game/gamemodes/gang/recaller.dm
 2015-06-28 08:30:00 -06:00
phil235
e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix 
Conflicts:
	code/modules/clothing/masks/gasmask.dm
 2015-06-28 15:22:21 +02:00
barackobama
7dfcc292b7 add a variable to mmi to indicate if it's of the syndicate variety as 
suggested
 2015-06-28 12:44:25 +01:00
barackobama
0316a836cb add a Syndicate surgery dufflebag full of tools to the uplink 
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
 2015-06-28 02:54:49 +01:00
Ikarrus
8c62ccfe2e Moves clothes from out of equipment lockers and into wardrobe closets 
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
 2015-06-27 17:22:02 -06:00
Ikarrus
7894263033 Destructible Clothing Tweaks 
- Fixes runtime with burning decals without reagents
- Adjusts some burnable flags
- Removes minimum shred prob()
 2015-06-27 13:33:33 -06:00
Ikarrus
18098752ac Gang Tweaks 
- Gang Lieutenants can buy gang tools now, but at a higher cost than the original boss
- Gang leaders can register additional gangtools to themselves for use as spares.
- Number of maximum lieutenants lowered to 2
- Pistol cost increased to 25 influence
- Uzi cost increased to 50 influence
- Uzi Ammo decreased to 20 influence
- Overcoats added to items the biogenerator can produce.

- Domination attempts reduced to 2
- Gang dominator time bonuses cannot reduce it lower than 5 minutes
- Showers will clean off lipstick and face paint
 2015-06-27 01:12:54 -06:00
Ikarrus
6cc17a6243 Resolved Conflicts: 
code/modules/clothing/clothing.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
 2015-06-27 00:17:02 -06:00
Ikarrus
8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
phil235
2aeefad94d Fixes runtime with do_after()'s that don't use a target. 
Adding missing "target=src" to a couple do_after() calls.
You can now close a fire axe cabinet by clicking it with a full hand (if it's not broken/locked)
 2015-06-25 19:05:23 +02:00