cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-05 06:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,792 Commits 60 Branches 14 Tags
45c33db77da8a64daaa55990510e81bb44725bf4
Commit Graph

5503 Commits

Author SHA1 Message Date
Alex
45c33db77d Merge pull request #4020 from caelaislinn/bugfix 
Various bugfixes
 2014-07-26 17:59:07 +01:00
Alex
90c97375e3 Merge pull request #4193 from A-t48/PrisonButton 
Fix #4164: Non-functional admin prison button
 2014-07-25 09:25:05 +01:00
Alex
6da164fa57 Merge pull request #4194 from A-t48/AdminMeteorConfirm 
Fix #3738 Admin spawned meteors has no announcement confirmation
 2014-07-25 09:24:46 +01:00
Alex
80b1e03c91 Merge pull request #4216 from Firecage/Foodstuffssss 
Making food code less bloated and messy.
 2014-07-25 09:24:11 +01:00
Alex
3ecf0fcc04 Merge pull request #4203 from MrPerson/track_bugs 
AI Tracking bugfixes
 2014-07-25 09:23:54 +01:00
Firecage
77d15a6c5b Moar restructuring 2014-07-23 06:10:21 +02:00
Cheridan
1e7a737a06 Merge pull request #4145 from Ergovisavi/faction_check 
Changes faction to list
 2014-07-22 19:10:53 -05:00
Kyle Franz
93a76deb27 Clean up prison button code a bit 
Add nicer confirmation message
Change access restriction from FUN to admins
Remove paralyzation\sleep
 2014-07-22 12:43:32 -07:00
Firecage
05662a1f23 Also some dividing shit. Fuck centcom 2014-07-22 17:31:26 +02:00
Firecage
4f2dbf2868 Making food code less bloated and messy. 2014-07-22 16:47:06 +02:00
Alex
1410641259 Merge pull request #4152 from paprka/fugfix 
Fixes security 'preview' sprites in setup
 2014-07-22 15:17:05 +01:00
Alex
172322c0ad Merge pull request #4192 from paprka/sleepyfix 
Fixes miauw's parapen laziness
 2014-07-22 15:16:46 +01:00
Alex
51e46ef80a Merge pull request #4211 from Firecage/AIcode 
Fixes AI code a bit >.>
 2014-07-22 15:16:27 +01:00
Cheridan
792ada6990 Merge pull request #4123 from Rolan7/Issue_4045 
Glowshroom and irrigation fix
 2014-07-21 08:40:38 -05:00
Cheridan
f6b9fef747 Merge pull request #4184 from paprka/xtraperiods 
Removes extra periods from (ban) [reason]
 2014-07-21 08:34:50 -05:00
Firecage
c0c9702c13 Fuck fucking spaces 2014-07-21 14:56:23 +02:00
Firecage
feeead99e9 Fixes AI code a bit >.> 2014-07-21 14:21:41 +02:00
Alex
8215cc962c Merge pull request #4200 from A-t48/ReadyButton 
Fix pressing ready button multiple times when connecting causing the button state to flip back and forth
 2014-07-21 09:06:10 +01:00
Alex
1e35eb0458 Merge pull request #4186 from Ergovisavi/killer_tomato_parasite_fix 
Fixes issue #4185 - Killer tomatos spawning in mobs/mechs/microwaves/etc
 2014-07-21 09:05:21 +01:00
Firecage
fd5c599d2f Merge branch 'Biogencode' of https://github.com/Firecage/-tg-station.git into Biogencode 2014-07-20 21:38:01 +02:00
Firecage
ad5ad41d98 Changes what Miauw said 
Signed-off-by: Firecage <firecage@hotmail.com>
 2014-07-20 21:36:19 +02:00
Firecage
5a463fafac Update biogenerator.dm 2014-07-20 21:23:58 +02:00
Firecage
7779a2f7e8 Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-20 21:10:53 +02:00
MrPerson
1755ec1db4 Merge branch 'master' of https://github.com/tgstation/-tg-station into track_bugs 
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
 2014-07-20 03:26:25 -07:00
MrPerson
fb6b7f1225 AI Tracking bugfixes 
Fixes #4201 by adding a cancel button to the track mob list.
Fixes a runtime that pops up if you double click the "Track Mob" or "Show Camera List" buttons on the AI hud. Problem is that double clicking runs a proc that builds the datum of lists of trackable mobs twice, and then both procs sleep because of input(). When the first track completes it nulls the tracking datum, which causes problems for the second (or more) tracks which expect the tracking datum to not be null. Solution: Keep the datum around and simply rebuild the lists as-needed instead of creating and deleting the tracking datum datum pointlessly.
 2014-07-20 03:21:02 -07:00
Alex
5b32928410 Merge pull request #3644 from Kaezon/master 
Drop contents on ex_act()
 2014-07-20 10:49:07 +01:00
unknown
0ebb633a16 Mining Machines: Implementing ex_act() 
Implemented ex_act() in both the ore redemption machine and the mining
vendor. Sparks were added as a feedback for any explosion that call
ex_act() on these machines.
To allow for the reconstruction of these devices, I have implemented
machine recepies and circuitboard definitions for these devices. I also added
R&D recipies for the circuitboards.
Offline and Open icons have been added for both objects.

Squashed all of my previous commits and fixed the leftover garbled code
from my original rebase.
 2014-07-20 01:11:06 -04:00
Kyle Franz
7036ff7735 Fix pressing ready button multiple times when connecting causing the button state to flip back and forth 2014-07-19 21:55:38 -07:00
Kyle Franz
fc5a6f9915 Fix #3738 Admin spawned meteors has no announcement confirmation 2014-07-19 00:20:19 -07:00
Kyle Franz
92ef19b8b9 Don't make imprisoned players lose all thier stuff 2014-07-18 23:05:14 -07:00
Kyle Franz
3f12c04b27 Fix nonfunctional Prison button on Player Panel 2014-07-18 23:03:57 -07:00
paprka
3bf4ecfba5 fixes laziness 2014-07-18 18:30:23 -07:00
Miauw
b73a32abb0 Merge branch 'master' of https://github.com/tgstation/-tg-station into changelingshieldsandarmor 
Conflicts:
	code/modules/clothing/head/helmet.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-07-18 12:52:40 +02:00
Alex
8b0c9b4950 Merge pull request #4162 from Kelenius/OfCamerasAndLights 
Makes camera lights not broken
 2014-07-18 09:33:41 +01:00
Ergovisavi
fa32b63189 Fixes issue #4185, Killer Tomatos will now spawn on the turf that the Killer Tomato plant exists in after the awakening process, stopping bizarre things like it spawning inside another mob or in a mech or other assorted silliness 2014-07-17 21:50:47 -07:00
paprka
b35cee5334 Removes extra periods from ban reasons 2014-07-17 17:51:20 -07:00
Kelenius
b67a751d57 Small fixes for camera lights 2014-07-18 02:44:26 +04:00
Kelenius
b938ad2dde Camera light uses cameranet and updates on movement now 2014-07-18 02:26:47 +04:00
Kelenius
80824ecac3 Changes light to Giacom's suggestion 2014-07-17 23:59:58 +04:00
Alex
d146eca7b1 Merge pull request #4149 from paprka/lemonlime 
Updates epic deus ex soda joke
 2014-07-17 09:31:40 +01:00
Alex
2d4ca8d363 Merge pull request #4150 from Ikarrus/miningfix 
[MAP] Mining Delivery System
 2014-07-17 09:30:19 +01:00
Alex
9a1a52d280 Merge pull request #4143 from paprka/hatstuff 
Hat/helmet tweaks
 2014-07-17 09:29:14 +01:00
Alex
06bcfbb638 Merge pull request #4154 from paprka/HALTSCUMBAG 
"HALT" sec hailer clip shortened
 2014-07-17 09:27:45 +01:00
Ergovisavi
9d643789d8 Fix for issue #4173, both soulstone mobs (and construct derivatives) and staff of animation mobs (statues included) are now properly tagged with a faction that is unique to the person that created them, stopping a Wizard's animated mimics from attacking his created constructs. 2014-07-17 00:40:24 -07:00
Alex
9150770991 Merge pull request #4165 from Cheridan/go_ape2 
MONKEY MODE: COLON CANCER EXCISION EDITION
 2014-07-17 07:48:11 +01:00
Firecage
76e9fed50c Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-15 22:36:54 +02:00
Cheridan
8fdd519401 Merge branch 'master' of https://github.com/tgstation/-tg-station into go_ape 2014-07-15 14:31:45 -05:00
Kelenius
094d7d139b Makes camera lights not broken 2014-07-15 20:06:04 +04:00
Firecage
0883d5994d Merge branch 'master' of https://github.com/tgstation/-tg-station.git 2014-07-15 13:52:44 +02:00
paprka
a10f614ec4 armor 2014-07-14 12:44:38 -07:00