cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-26 17:41:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,792 Commits 59 Branches 14 Tags
45c33db77da8a64daaa55990510e81bb44725bf4
Commit Graph

10286 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
128cb7d9c7 Merge pull request #4124 from MrPerson/qdel_mecha 
Fixes some issues with mechs getting deleted
 2014-07-25 09:25:55 +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
Alex
ce16f64440 Merge pull request #4215 from Jordie0608/igaveupuninstallingIEfrommycompafterigotXP 
Rework of show-server-revision
 2014-07-25 09:23:36 +01:00
Alex
0bce669482 Merge pull request #4217 from A-t48/MechaNorthStar 
Fix #3821 Attacking mechas has no click cooldown
 2014-07-25 09:22:58 +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
94bde48ac3 Expanding comments 2014-07-22 15:41:54 -07:00
Kyle Franz
cb7cbc74e7 Cooldown on attacking a mech even if your weapon deflects 2014-07-22 15:38:04 -07:00
Kyle Franz
1e691d2b26 Fix #3821 Attacking mechas has no click cooldown 2014-07-22 15:27:00 -07: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
MrPerson
e521a67a12 Giacom's suggestions, plus removing more pointless checks. 
You can now type track foo as an AI and it'll track foo or expand into a full listing if ambiguity exists. It's not track-with-camera, just track.
 2014-07-22 08:00:57 -07:00
Firecage
4f2dbf2868 Making food code less bloated and messy. 2014-07-22 16:47:06 +02:00
Jordie0608
a3c3478147 made link into href 2014-07-23 00:39:50 +10:00
Alex
e4de28b13e Merge pull request #4170 from RemieRichards/FixDoorLockerWeld 
Fixes Permanent Airlock welding, adds sound to dismantling a locker
 2014-07-22 15:18:32 +01: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
Jordie0608
c9e21033ae Rework of show-server-revision 2014-07-22 23:05:10 +10:00
Alex
ab98b7e94d Merge pull request #4209 from paprka/ebinperiodbro 
Fix extra period from objective
 2014-07-22 08:06:19 +01:00
Alex
07267b4220 Merge pull request #4208 from paprka/tfwnogrille 
Grille hitting text fix.
 2014-07-22 08:02:55 +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
paprka
644b702311 period 2014-07-21 00:11:31 -07:00
paprka
9747d26081 you no longer kick grilles 2014-07-20 22:58:48 -07: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
Cheridan
3ab71bc987 Merge pull request #3363 from Miauw62/changelingshieldsandarmor 
Organic Shields and Chitinous Armor for lings!
 2014-07-19 11:10:03 -05: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
Swag McYolosteinen
ed43664e5f Merge pull request #4177 from Firecage/master 
Some Bug Fixes
 2014-07-18 17:08:40 +02: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