cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 15:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,602 Commits 61 Branches 14 Tags
b6ca0139cbf9eba023e06df0cc2cfaad8a14a5e7
Commit Graph

5006 Commits

Author SHA1 Message Date
Razharas
b6ca0139cb No logging for explosive bullshit 2014-04-22 19:04:10 +04:00
Razharas
603c72549b Fixes goats not eating vines 
Yep it was a bug
 2014-04-22 13:14:53 +04:00
Razharas
ae2e0cd929 Merge branch 'master' of https://github.com/tgstation/-tg-station into ExpVineFix 2014-04-22 12:57:45 +04:00
Razharas
f5c66b3bda Fixis colouring, forgot some of the #s 
Yep
 2014-04-22 12:57:28 +04:00
Cheridan
df8b266d38 Merge pull request #3445 from Incoming5643/magicmania1.6 
Magic Mania 1.6: Baby's Day Out
 2014-04-21 22:30:34 -05:00
Cheridan
fd62e88d6f Merge pull request #3448 from Ikarrus/lingchatlog 
[Admin] Added logging for changeling hivemind chat
 2014-04-21 21:55:19 -05:00
Incoming
be8671fcf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.6 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-04-21 19:00:04 -04:00
Cheridan
4539711d9a Merge pull request #3459 from MrPerson/screen_deletion 
Remove some unnecessary code of mine that's causing runtimes
 2014-04-21 13:26:49 -05:00
Cheridan
0a1c77964d Merge pull request #3469 from phil235/HornStunFix 
weapons with force below 5 now have no chance to knock down
 2014-04-21 12:58:29 -05:00
Cheridan
1450960ad7 Merge pull request #3462 from Niknakflak/AIdeathcore 
AIs.  New cores, death cores.
 2014-04-21 12:56:04 -05:00
Miauw
658c753989 Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2" 
This reverts commit f2d850ee25, reversing
changes made to 805e2570bf.
 2014-04-21 18:59:58 +02:00
Miauw62
f2d850ee25 Merge pull request #3218 from AndroidSFV/aiphotoext2 
AI Photography Extention #2
 2014-04-21 18:18:16 +02:00
phil235
46ac3c15f5 can't knock down if aiming at head. 2014-04-21 18:05:14 +02:00
Cheridan
0ecf8a5d9e Merge pull request #3465 from Giacom/pandemic_fix 
Ports a Pandemic machine fix
 2014-04-21 10:18:19 -05:00
Razharas
4ff66475ce Quick fix of explosive vines 
Wasnt producing explosions otherwise
 2014-04-21 12:06:50 +04:00
Cheridan
753979a915 Merge pull request #3458 from Firecage/master 
Some stuff about the mime backpack.
 2014-04-20 23:06:10 -05:00
Niknakflak
3cdcc2e10f edited 2014-04-20 20:59:17 -07:00
Giacomand
18a075a14e Fixes hotkey mode always being set during login. winget() was returning "true", not 1 or 0. It now compares for the string. 2014-04-21 00:40:23 +01:00
phil235
92446f2384 weapons with force below 5 can't knock down 2014-04-20 20:28:27 +02:00
phil235
61f3fabb59 force 0 weapons now have no chance to knock down 
fixes #3414  where the bikehorn had a 10% chance of knocking down someone when aiming at the chest
 2014-04-20 20:01:18 +02:00
Cheridan
b250f3ad55 Merge pull request #3453 from Menshin/Sun_and_solars 
Sun and solars
 2014-04-20 09:11:50 -05:00
Giacomand
7c297c4262 Ports Pandemic machine fix from https://github.com/NTStation/NTstation13/pull/469 2014-04-20 11:13:43 +01:00
Niknakflak
b5b17882b0 Does a lot of stuff 2014-04-20 01:42:52 -07:00
Firecage
b8be6cea71 Merge branch 'master' of https://github.com/tgstation/-tg-station.git 2014-04-20 09:30:16 +02:00
AndroidSFV
8a7c3dc9a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into aiphotoext2 
Conflicts:
	code/game/machinery/newscaster.dm
 2014-04-20 01:30:44 -05:00
Razharas
a2895ed9dc Merge pull request #3446 from Aranclanos/LindaChecks 
Admin status panel, extra air thingies
 2014-04-19 19:04:49 -07:00
MrPerson
5e92f3acfe Remove some buggy ass, unnecessary code of mine that's causing runtimes 2014-04-19 12:56:43 -07:00
Firecage
dff7ebc0a4 Signed-off-by: Firecage <firecage@hotmail.com> 2014-04-19 21:42:31 +02:00
Cheridan
7cb4f4141e Merge pull request #3450 from Razharas/VineFix 
Fixing instagib vine
 2014-04-19 14:31:11 -05:00
Menshin
0fda25c757 * sun and solars now uses world.time instead of timeofday, 
* the solar panels are now rotated instantly instead of slowly do it every tick,
* code cleaning
 2014-04-19 18:31:22 +02:00
Menshin
7347b1bebd * tweaked the solar update method to be more accurate 
* added a check for the midnight rollover of timeofday
* the manual tracking orientation is now synchronized with the sun position update
* now checking if the solar panel/tracker/computer is not already in the solars_list before adding it
* added a message noticing the beginning of a solar panel/tracker deconstruction
* tweaked the manual tracking for better accuracy : the orientation is increased/decrease internally and updated altogether the sun.
 2014-04-19 13:06:27 +02:00
Razharas
8f6897964c Merge pull request #3418 from VistaPOWA/pr_announce 
[CONFIG][BACKEND] Adds PR announcing to the game.
 2014-04-18 19:05:44 -07:00
Razharas
37cb6f9220 AHJGFD 2014-04-18 19:48:32 +04:00
Razharas
d536671fd7 Fixing instagib vine 
>Lower severity means higher damage
>Intuition
>Logic
>Sanity
 2014-04-18 19:24:08 +04:00
ikarrus
14fe3bc29a [Admin] Added logging for changeling hivemind chat 
Also added their Changeling names to the Antag panel so admins don't have to go digging through vars to find out who was OOC in ICing.
 2014-04-17 21:23:11 -06:00
Aranclanos
ca67aeb3aa Added more stuff to the status panel for admins, air related, these are only temporal (hehehe) 2014-04-17 21:37:06 -03:00
Incoming
c83728bba1 Magic Mania 1.6: Baby's Day Out 
*Adds unique sprites for the staves of door creation and chaos
**Item sprites
**Inhands
**Onbacks

*Fixes #3232 in a way that isn't terrible

*Basically this is the part of 1.5 that should have been done back when it was added
*Please raise wizard rates :3
 2014-04-17 19:35:42 -04:00
Ergovisavi
896414bcc4 Increased cost of gygax, decreased cost of durand, capped protolathe coeff at 2x 2014-04-16 20:09:54 -07:00
Ergovisavi
f302adc8ab Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-04-16 16:58:28 -07:00
Cheridan
b8e6e61dec Merge pull request #3426 from RandomMarine/theteargasitburns 
Removes HEADCOVERSEYES from caps
 2014-04-15 23:42:56 -05:00
Cheridan
4c66f666cb Merge pull request #3425 from Giacom/fix_magboots 
Fixed magboots requiring to be turned on and off to correctly set NOSLIP...
 2014-04-15 14:09:10 -05:00
Cheridan
75919440d6 Merge pull request #3412 from Giacom/someone_was_lazy 
Fixed the lazy "fix" which caused mobs that Login or Logout to lose their hotkey mode.
 2014-04-15 11:24:07 -05:00
Cheridan
71cd05cf49 Merge pull request #3393 from Razharas/GrabPull 
Added datum mutations
 2014-04-15 10:27:31 -05:00
Cheridan
dac4393fc4 Merge pull request #3404 from Aranclanos/lizardssss 
Mutant race character preferences.
 2014-04-15 09:59:06 -05:00
RandomMarine
7e71f041fe Removes HEADCOVERSEYES from caps 2014-04-14 19:03:10 -07:00
Giacomand
aa3a290cf2 Even more refactoring. 2014-04-14 22:51:37 +01:00
Giacomand
ab0c6f9c58 Fixed magboots requiring to be turned on and off to correctly set NOSLIP; was caused by flags being null, instead of 0. 
Refactor'd the magboot code to be more elegant.
 2014-04-14 22:35:32 +01:00
Razharas
75246052a3 Merge branch 'master' of https://github.com/tgstation/-tg-station into GrabPull 2014-04-15 01:24:51 +04:00
Razharas
40c349c052 A little tweak 2014-04-15 01:24:36 +04:00
Menshin
d197be0540 Changes to the Sun : 
* Changed the way the sun was orbiting around the station (or is it the other way around ?), based on real time rather than an inaccurate ticks counter.
* The sun can now be up to twice as fast or slow as standard rotation (1h)
* The sun start with a random angle to the station at round start
* The sun can rotate clockwise or counter-clockwise

Changes to Solars :
* The panels calculate the shortest rotation to get from their position to another.
That also fixed the bug where the panel would backtrack all the way when finished a full rotation (e.g 355° to 1°)
* The exposition to the sun of a panel is now correctly calculated (fixed the bug, where
if the sun was, for example, at 1° and the panel at 359°, no light would arrives to the panel)
* Corrected the timers for the timed rotation.
* Panels made with reinforced glass now have the double of health
 2014-04-14 23:02:57 +02:00