cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 04:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,223 Commits 61 Branches 14 Tags
017cd65250aa79b7ac7ffd4e1c1664e59628fa71
Commit Graph

72 Commits

Author SHA1 Message Date
c0
04f1aafa78 Exports 2016-04-13 06:01:40 +03:00
PKPenguin321
fb93268e5e gives sand a new function 2016-03-20 16:49:43 -07:00
KorPhaeron
db20c9cf4f Lavaland Sand 2016-03-18 14:09:30 -05:00
Bjorn Neergaard
205809c25f Unanchor gibtonite, fix up some pull code 2016-02-13 00:26:28 -06:00
Bjorn Neergaard
b2629a56e2 Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes 2016-01-22 19:25:33 -06:00
Bjorn Neergaard
87b0857b93 Refactor wire datums 
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
 2016-01-22 19:22:09 -06:00
Kole6738
d20194a546 removes else 2016-01-05 18:28:31 -08:00
Kole6738
f88595d073 Thanks 2016-01-05 15:25:21 -08:00
Kole6738
292837a248 Prevent flipping a coin if wired 
Fixes graphical bug #14343 with extreme overkill. If the coin has an attached wire, it won't flip. Someone else might want to instead fix the animation so that the wire moves with the coin.
 2016-01-04 18:36:32 -08:00
bgobandit
bcd456eea1 Added new PKA, R&D designs, tweaked numbers, honked the honk up the honk 2015-11-23 18:44:54 -05:00
bgobandit
47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
c0
77787688ec fix 2015-09-13 23:47:03 +03:00
c0
75f2c92ebc Adds materials to ore 2015-09-13 23:37:13 +03:00
bear1ake
c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero 
Conflicts:
	code/modules/research/protolathe.dm
 2015-09-12 21:07:40 +09:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
bgobandit
b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa 
Conflicts:
	code/modules/assembly/flash.dm
 2015-09-09 14:04:41 -04:00
c0
df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
bgobandit
d23f2cb622 mats for toolboxes, glasses and flashes; adjusts coin amounts up slightly 2015-08-31 12:14:34 -04:00
bgobandit
084965803a Circuit boards now give glass, not gold. Adds materials to AI modules and coins. 2015-08-31 09:37:44 -04:00
xxalpha
19947d4fa0 Added qdel(wires) to a bunch of objects Destroy proc. 
Return ..()
 2015-08-27 11:10:58 +01:00
phil235
90f54ba95c Fixes the do_after progress bar appearing on a coin when flipping+throwing it. 2015-08-23 19:34:09 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +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
Jordie0608
a67de221cc JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging 2015-06-14 23:37:35 +10:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
Jordie
4e1b27c08b Merge pull request #9135 from Incoming5643/validsalid 
Adds Antag Tokens!
 2015-04-25 19:14:34 +10:00
Incoming
a5fc495a27 please don't tell anyone I forgot how to spell salad 2015-04-24 17:55:53 -04:00
kingofkosmos
761d31cea0 More visible.message span classes removed. 2015-04-24 21:24:21 +03:00
kingofkosmos
a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +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
Incoming
6e25a57230 Adds Antag Tokens! 
They're a novelty coin with a syndie helmet (valid) on one side and a salid (salid) on the other.
Found as a prize in arcade machines, Sec can also get one from their vendor as a premium item.
 2015-04-23 19:08:38 -04:00
ACCount12
1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
phil235
7ba8af5222 Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods. 
Reorganizes all flashing to use the same mob proc 'flash_eyes()' (welding tool use, flashbang, flashers, laserpointers, etc).
Fixes making sandstone not stacking the result sandstones on the floor.
Sandstone, grass tile and carpet tile now look for other incomplete stack on their creation location to try to put them all in one stack (exactly like wood planks).
Fix typos.
Remove banglet var from all flashbangs, making flashbangs from clusters behave exactly like the other ones.
Renames eyecheck()proc to check_eye_prot() and moves it to mob/living level, elso creates check_ear_prot() for checking ear protection.
 2015-03-10 20:30:46 +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
phil235
9e8531448a Fixes admin logging of gibtonite and gibtonite deposit. Drilling it with a mech, using a kinetic accelerator, and using a resonator log the attacker's name. 
Gibtonite and gibtonite deposit being triggered by an explosion is now correctly logged.

The explosion of the gibtonite deposit (outside of mining level of course) is now logged.
 2015-01-15 00:56:50 +01:00
phil235
d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
Cheridan
865391d6a1 Merge pull request #5233 from Jordie0608/stateoftheiconstates 
[MAP] Fixes energy guns, coins, arrivals chairs and syndiebombs not having icons in map editor
 2014-10-16 08:28:13 -05:00
Aranclanos
e6c533eb95 Merge pull request #5253 from phil235/SandstoneStackFix 
You can no longer make stacks of grasstile/sandstone bigger than max amount
 2014-10-15 10:46:58 -03:00
phil235
d85beb0d0a Fixing sandstone stacking. 2014-10-14 21:56:36 +02:00
phil235
d66b0e61f0 Fixes the ability to make stacks of grasstile/sandstone larger than the max amount authorized. 
Fixes an error in the amount of grasstiles produced.
Fixes some unnecessary capitalisation in mineral deposit names.
 2014-10-14 21:22:08 +02:00
Jordie0608
93f46d186a Fixes energy guns, coins and syndiebombs not having icons in map editor 2014-10-14 01:16:15 +11:00
paprka
4fbe9730f6 Mining rebalancing 2014-09-27 17:04:56 -07:00
Swag McYolosteinen
f9e17faca3 Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire 
Repaths clown ore to bananium
 2014-09-24 16:58:23 +02:00
Jordie0608
40e0a52283 Repaths clown ore to bananium 2014-09-19 21:26:50 +10:00
Perakp
3a3f703ed9 Mining scanner scans automatically, similar to t-ray scanner. 
Cooldown increased for balance/ to not have the flashing ores be too annoying.
 2014-09-08 15:00:37 +03:00
Lo6a4evskiy
82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04:00
Firecage
dac8669166 Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork 2014-08-23 10:13:21 +02:00
Miauw
71e1b38eb5 Adds slot machines. 2014-07-03 19:50:22 +02:00
Kelenius
3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
Ergovisavi
d55d72f049 Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-03-26 18:14:48 -07:00