cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,413 Commits 61 Branches 14 Tags
1759d492f04fa4a5e4e39c405e747956800a52dc
Commit Graph

92 Commits

Author SHA1 Message Date
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
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +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
xxalpha
4b5659cbf2 what the fuck was I thinking with this one 
Negative layers
 2015-07-10 19:58:50 +01: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
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
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
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
 2015-06-23 12:54:26 -07:00
Cheridan
e3fa954daa Merge pull request #10025 from phil235/WindowBugFix 
Two window/windoor bugfixes
 2015-06-23 12:23:32 -05:00
Remie Richards
ee1e30717a Merge pull request #9980 from LaharlMontogmmery/ContentTransfer 
Container Content Transfer - Good for Review (Again...Again.)
 2015-06-21 00:09:19 +01:00
Cheridan
a45804dcfe Merge pull request #10033 from optimumtact/reeeeeeee_hitby_messages 
Hitby messages removed, may help with singularity lag from throwing
 2015-06-20 00:19:03 -05:00
oranges
ea1df76a6d Hitby messages removed, may help with singularity lag from throwing 2015-06-19 15:32:56 +12:00
LaharlMontogmmery
373c918a4a Going through some hOOPs - bit of a overhaul. 2015-06-18 17:40:35 +02:00
phil235
91f05d1a21 Fixes windoor not being damaged by fires. Fixes not being to attack windows with a welder on harm intent. 2015-06-18 14:57:24 +02:00
kingofkosmos
c8d79e7034 Removed unnecessary spaces in these situations: 
"span class = '" changed to "span class='"
"'> " changed to "'>"
 2015-06-14 12:13:19 +03:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
barackobama
a6ae5dbe47 Increase max ammo for RCD, allow RCD to be loaded 
with glass, metal, and plasteel, allow RCD to build
and deconstruct grilles and windows, add three RCDs
to the Engi-Vend machine
 2015-06-13 15:40:06 +01:00
kingofkosmos
de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
phil235
6996897b65 Fixes fulltile windows not spawning the correct amounts of shards and rods. 
Fixes broken grille not dropping a rod when shot with buckshots.
 2015-04-11 17:41:09 +02:00
phil235
456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
Firecage
f40d799e34 Simply adds a delay to knocking in windows with TK. 2015-01-15 11:49:38 +02:00
phil235
1153ef4700 Merge pull request #6651 from paprka/tablesandwindowsbaby 
Fixes shuttle windows smoothing with normal windows
 2015-01-03 00:22:29 +01:00
paprka
ad5872e84f fixes window junction update to use initial icon state 2015-01-02 15:14:36 -08:00
paprka
b52a3915fb Fixes shuttle windows smoothing with normal windows 2014-12-29 04:58:53 -08:00
Razharas
10b21b20ab Conflicts resolution 
In items weapons melee misc
 2014-12-29 11:49:30 +03:00
phil235
558f263732 Removed the ability of windows to be unanchored and ejected when low on health. 2014-12-24 20:45:47 +01:00
Razharas
0921aa201f Added datum mutations 
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
 2014-12-12 04:48:11 +03:00
Razharas
7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
Orange Borg
97f10f6812 Add feedback to window construction/deconstruction 
Users didn't get any feedback when the process started
 2014-12-01 10:36:26 +13:00
Razharas
3511e0dada Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 
Conflicts:
	code/game/turfs/simulated/walls.dm

Ye somth liek dat
 2014-11-23 17:46:14 +03:00
hornygranny
dce9dadea2 Merge pull request #5914 from paprka/removewindows 
Changes most border windows/firelocks to full tile
Gets paprika killed
 2014-11-21 11:47:04 -08:00
Razharas
afac70c4f7 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-19 21:37:06 +03:00
Razharas
ff456ebaf4 Unwinded most of shit 
Meh
 2014-11-19 21:36:45 +03:00
paprka
bda5947d30 improves firelocks, window damage, and window deconstruction 2014-11-18 18:25:47 -08:00
paprka
537c0705c9 health tweak to be additionally rounded 2014-11-16 20:54:19 -08:00
paprka
8ee2330c0f fixed metastation, fixed basic window having no icon state 2014-11-16 17:57:29 -08:00
paprka
4822519c44 adds help intent check for repairing windows 2014-11-16 17:35:06 -08:00
paprka
c009049033 added window repairing 2014-11-16 17:26:55 -08:00
paprka
fd910387c3 windows damage and such 2014-11-16 17:13:33 -08:00
paprka
007ab4dd08 shuttle windows 2014-11-16 15:59:46 -08:00
phil235
8ac93c41db Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1 
Conflicts:
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
 2014-11-07 20:16:14 +01:00
phil235
bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
phil235
74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation 
Conflicts:
	code/modules/mob/living/living.dm
 2014-11-04 18:55:07 +01:00