cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 21:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,317 Commits 61 Branches 14 Tags
cde4df61ae2e4afc19a9f43327891b808bb2c8e6
Commit Graph

109 Commits

Author SHA1 Message Date
MMMiracles
c384aae4c3 more map edits, loot table balancing, bug fixes, also ATV VROOM VROOM 2015-12-08 00:43:53 -05:00
MMMiracles
6c685d6d67 wew 2015-12-06 02:14:26 -05:00
MMMiracles
8ab579cb21 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold 
Conflicts:
	icons/mob/animal.dmi
 2015-12-04 18:55:10 -05:00
Vincent
6f6968773b Fixes #13418 2015-12-03 22:46:56 -05:00
MMMiracles
77b36e2415 iced windows, more ice variants of shit in general. 
more stuff, ice everything.

wew

conflict fix
 2015-12-01 16:45:09 -05:00
Vincent
bf530cc3dd Fixes untouchable windows 
Sorry about that.  Fixes #13354
 2015-12-01 11:54:09 -05:00
Vincent
16303c1c1f Changes flag name from ABSTRACT to NODECONSTRUCT 
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this.  Removes spurious tag tags in Z2.
 2015-11-30 20:26:03 -05:00
Vincent
05ae680b06 Fixing conflicts: 
code/game/machinery/computer/computer.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/objects/structures/window.dm
 2015-11-29 19:02:30 -05:00
Vincent
026e6ee772 Sets up the the ABSTRACT flag to be used by machines and structures that should not be disassembled or break into parts. 
This is specifically used by the holodeck for things that should be immune to disassembly.

Fixes invisible windoors in the holodeck.
Standardizes the fire axe's interaction with windows.
Fixes a runtime with holodeck tiles getting broken or burned.
 2015-11-26 21:11:54 -05:00
Firecage
c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
kingofkosmos
e75d24a6c9 Changes checks in altclicks from canusetopic to incapacitated. 2015-11-01 11:24:17 +02:00
Razharas
1105a2b820 Merge pull request #11899 from kingofkosmos/altclickrotatepipe 
Alt-click to rotate stuff
 2015-09-24 01:59:04 +03:00
xxalpha
36ae116a48 Added another mode for smoothing (smooth with all subtypes). 2015-09-23 00:55:10 +01:00
kingofkosmos
14332a0d3a Adds altclick-rotation + descriptions for chairs and windows. 2015-09-20 17:50:41 +03:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
duncathan
51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Ergovisavi
9572bd6aa6 -First revision of Swarmer mob, hud, icons, etc 
-Adds functionality of ignored damage types to simple mobs
-Adds functionality of melee damage types to simple mobs
 2015-08-25 03:24:34 -07: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
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