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

1268 Commits

Author SHA1 Message Date
Cheridan
95e269e211 Merge pull request #8122 from Xhuis/miners_messiah 
Adds the ore satchel of holding
 2015-03-06 15:15:40 -06:00
Cheridan
0496dcd446 Merge pull request #8169 from dannno/morebarsigns 
adds more barsigns
 2015-03-06 13:35:13 -06:00
dannno
d1b1e9f05c changelog 2015-03-06 12:49:08 -05:00
Cheridan
7c960c6101 Merge pull request #8163 from Jordie0608/hiorangeshowareyou 
Changelog compiled and instructions edit
 2015-03-06 11:25:57 -06:00
Cheridan
6b512f663a Merge pull request #8137 from Incoming5643/so_misunderstood 
Removes the Spooky
 2015-03-06 00:09:25 -06:00
Cheridan
9cf4a0bfc6 Merge pull request #8114 from phil235/CookTrash 
Cooking fixes for meat and trash
 2015-03-05 23:54:29 -06:00
Swag McYolosteinen
daa6fa89d0 Merge pull request #8014 from paprka/altclick2 
Alt click for PDAs
 2015-03-05 19:13:07 +01:00
Swag McYolosteinen
372e082c66 Merge pull request #8013 from paprka/altclick 
Alt-click for aesthetic toggling
 2015-03-05 19:12:07 +01:00
WJohn
1c55a568f2 Merge pull request #8075 from Xhuis/the_coderbus 
Adds the Coderbus and Adminbus bar signs: No merge conflicts edition
 2015-03-05 13:08:33 -05:00
Jordie0608
6c389787bd rogue or 2015-03-05 20:29:43 +11:00
Jordie0608
500a030a8d Edited example yml for only double quotes 2015-03-05 20:28:03 +11:00
Jordie0608
cc052cb22d Changelog compiled 2015-03-05 20:24:42 +11:00
Jordie0608
9fcb7ad02c Taser changelog and spellfix 2015-03-05 20:21:23 +11:00
Razharas
2a3c211d81 Merge pull request #8131 from Jordie0608/sooneverythingwillbechangelogs 
Re-adds changelog popup as a config option
 2015-03-05 12:06:19 +03:00
Cheridan
f68fd02d26 Merge pull request #8101 from MrPerson/alert_alert_ur_a_faget 
On screen alert system
 2015-03-04 19:39:04 -06:00
Cheridan
56b0c321ac Merge branch 'BlobReroll' of git://github.com/RemieRichards/-tg-station into RemieRichards-BlobReroll 
Conflicts:
	code/game/gamemodes/blob/overmind.dm
 2015-03-04 00:33:44 -06:00
Incoming
8192ea7e06 Removes the paths to get skeletons and zombies in normal play but also does not nerf them. They can still be found through a few very rare mutation chances (I think?) and wizbiz. 2015-03-03 16:55:02 -05:00
phil235
8a7c2c2730 Adding changelog 2015-03-03 22:40:51 +01:00
Remie Richards
d36488e5a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NecromanticStone 
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	icons/obj/wizard.dmi
 2015-03-03 20:58:38 +00:00
Incoming
a028062624 Skeletons and zombies lose temperature immunity and radiation immunity, reducing how awesome they are in the face of their relative ease of access. They still don't breathe or have blood. 2015-03-03 14:46:32 -05:00
Xhuis
2499ed82f4 Adds the ore satchel of holding 2015-03-03 07:26:58 -05:00
Swag McYolosteinen
c2290c6c5c Merge pull request #7913 from phil235/NewPlants 
Adds new plants to botany
 2015-03-03 11:23:32 +01:00
Jordie0608
13ec61651f Changelog for changelogs 2015-03-03 19:55:28 +11:00
Jordie0608
501e010766 Changelog compiled 2015-03-03 18:18:06 +11:00
Jordie0608
5e377aaf07 Missed an error 2015-03-03 18:17:41 +11:00
Jordie0608
293bf0b12e Fixes and adds missing ymls 2015-03-03 18:15:53 +11:00
Razharas
a07f6e6bfa Merge pull request #8103 from Ikarrus/antag_babbies 
Age Restrictions for Antagonists
 2015-03-03 09:02:52 +03:00
MrPerson
24dcf08b2e Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget 
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	icons/mob/screen_alien.dmi
 2015-03-02 12:04:38 -08:00
Swag McYolosteinen
4272ada464 Merge pull request #8042 from Mandurrrh/ghostpda 
Adds the ability to see pda messages in Deadchat
 2015-03-02 19:56:28 +01:00
phil235
d2d0888432 Merge pull request #7726 from xxalpha/traymesons 
Mesons+T-Ray = Engineering Goggles
 2015-03-02 19:24:06 +01:00
Mandurrrh
cde9de9e85 merge commits 2015-03-02 12:40:16 -05:00
Cheridan
2be30eb89e Merge pull request #8083 from Delimusca/getochemboyz 
added improvised heating
 2015-03-02 08:58:12 -06:00
Cheridan
00be838acc Merge pull request #8011 from Jordie0608/CMOSisforscrubskeepyourcomputerclocksavedinRAM 
Server time for status panel
 2015-03-02 08:32:48 -06:00
phil235
d856e240c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-03-02 13:45:15 +01:00
Cheridan
8d9d45131b Merge pull request #8004 from GunHog/RemovesXenoFunFromExperimentor 
Replaces Xenomicrobes with Sulfuric Acid
 2015-03-02 01:12:56 -06:00
Cheridan
e812f8a47b Merge pull request #7844 from RemieRichards/DroneUpdate20-02-2015 
Drone Skins + Drone Organic Vision Modes
 2015-03-02 00:56:12 -06:00
Cheridan
73d9adbeb4 Merge pull request #8079 from Xhuis/moar_emoji 
Adds four new emojis
 2015-03-02 00:36:28 -06:00
Ikarrus
f95ca85ed6 Age Restrictions for Antagonists 
Default minimum age is 7 days.
Team Antag modes and wizard is 14 days.
Malf minimum is 30 days (Same as AI minimum age).
 2015-03-01 20:40:04 -07:00
MrPerson
ec260df67d Also a changelog entry 2015-03-01 18:08:03 -08:00
Cheridan
bbbf666c9a Merge pull request #8051 from xxalpha/surgeon_ops 
Adds surgery table and tools to the Nuke Ops ship.
 2015-03-01 19:53:19 -06:00
Swag McYolosteinen
f6576e66b5 Merge pull request #8090 from Jordie0608/iamthetruemasterofthemasterbranch 
Compiles changelog and modifies python script to use less div classes
 2015-03-01 20:55:59 +01:00
Swag McYolosteinen
ba3b161572 Merge pull request #8043 from Mandurrrh/kelvingrammar 
Fixes  #7935 correct use of Kelvin without degrees.
 2015-03-01 20:55:22 +01:00
Xhuis
02d09046d4 Changeling 2015-03-01 12:48:01 -05:00
Xhuis
eb745941c5 Adds the Coderbus and Adminbus bar signs 2015-03-01 12:44:11 -05:00
Jordie0608
239d72c537 updates for mso's changelog 2015-03-02 00:04:05 +11:00
Jordie0608
e115cb4543 compiles changelog with less div 2015-03-01 23:35:20 +11:00
Jordie0608
902ea7f408 edited steelpoint's changelog 2015-03-01 23:11:41 +11:00
Jordie0608
b0732c2ee7 adds and edits some ymls 2015-03-01 23:02:45 +11:00
Jordie0608
505852f6ff Culls changelog gen's div class usage 2015-03-01 22:05:59 +11:00
Razharas
e505acf591 Merge pull request #7985 from Jordie0608/tgstationisaparadiseforlumberjacks 
Cleanup of changelog related files
 2015-03-01 13:20:33 +03:00