cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 19:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,870 Commits 61 Branches 14 Tags
8e9c5c19c8ab960e9cf005748cbd2d63c3199dd9
Commit Graph

3784 Commits

Author SHA1 Message Date
Giacomand
8e9c5c19c8 * Set the cooldown, for creating virus culture bottles, from 100 to 5 seconds. 
* Bottles spawned through the Pandemic will have a random pixel_x/y.
 * The recipe to remove a symptom from a virus (synaptizine + blood) will now only require 1 unit of synaptizine.
 2013-12-18 17:33:03 +00:00
Giacom
7473950247 Merge pull request #1996 from Incoming5643/happyholidays 
[map] Do they know it's Christmas time at all?
 2013-12-13 13:30:24 -08:00
Giacom
dc9ba09a22 Merge pull request #2013 from JJRcop/doomsday 
Adds Doomsday to holidays
 2013-12-13 13:28:05 -08:00
Giacomand
eb61c70cb3 Merge branch 'master' of https://github.com/tgstation/-tg-station into centcom_typo 2013-12-13 21:19:55 +00:00
Giacomand
ceec829294 Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950. 2013-12-13 21:14:23 +00:00
Giacom
e596ffe2ba Merge pull request #2001 from EuroNumbers/master 
Turbine v2.0 - first step
 2013-12-13 09:36:09 -08:00
Giacom
b0c36c2709 Merge pull request #2005 from ACCount12/master 
Syringe gun - now 80% more gun! Fixes #1935
 2013-12-12 16:16:16 -08:00
Aranclanos
c04938cbc1 Merge pull request #1968 from Adrinus/12-03-13-Orion_Trail 
Adds a new Arcade Machine.
 2013-12-11 16:37:11 -08:00
Cheridan
193d63c0e1 Merge pull request #2008 from Giacom/xmas_newshat 
Added a santa hat icon for the entertainment monitor. Made it change in the Xmas event.
 2013-12-11 09:47:53 -08:00
Aranclanos
1ee59747c4 Merge pull request #1940 from YotaXP/HTML-Entities-and-Timestamps 
NTSL, parrots, and ID consoles hate apostrophes less.
 2013-12-10 04:53:09 -08:00
Aranclanos
8f1f632b35 Merge pull request #2000 from Cheridan/PlantThatGrows357Revolvers 
Plant that grows 357 revolvers
 2013-12-09 17:43:35 -08:00
Giacomand
25c43d0a98 Added a santa hat icon for the entertainment monitor. Made it change in the Xmas event. 2013-12-09 19:35:31 +00:00
Giacom
caa8190d61 Merge pull request #1994 from cem/chem 
Increase Chem Dispenser window height
 2013-12-09 08:30:03 -08:00
ACCount
5fde461f1e Syringe gun wants to be real gun! 2013-12-09 21:40:51 +12:00
JJRcop
0e62ab1adc Adds Doomsday to holidays 2013-12-08 20:41:02 -05:00
EuroNumbers
29d637240f Update turbine.dm 
Replaced outdated code that wounded up there for no reason.
 2013-12-09 01:25:10 +01:00
EuroNumbers
64c08c6482 Update turbine.dm 
Made compatible with LINDA
 2013-12-09 00:17:03 +01:00
EuroNumbers
372992ca36 Lowercased "gas turbine control computer" 2013-12-08 22:47:29 +01:00
EuroNumbers
c2a4de92cc Update turbine.dm 
Turbine now works as intended in rev4407
Tweaked the power generation too to fit the increased demand
Still needs a better computer code
 2013-12-08 21:33:25 +01:00
Cheridan
f96755857d The plant that grows .357 revolvers. 2013-12-08 13:32:33 -06:00
Cheridan
b949afd872 Merge pull request #1970 from Ikarrus/adminnotice 
Admin Notices
 2013-12-08 10:32:45 -08:00
Incoming
3432aaf583 Adds a christmas tree to the bar 
Adds a festivus pole to the science break room
Adds a santa outfit to the captains office so he can spread cheer to the crew
 2013-12-08 13:23:55 -05:00
Cem Kocagil
d29f583062 Increase Chem Dispenser window height 2013-12-08 18:34:59 +02:00
Aranclanos
552c77fd81 Merge pull request #1990 from VistaPOWA/aluminium 
Replaces 'aluminum' with 'aluminium'.
 2013-12-08 07:32:54 -08:00
Aranclanos
498ba1acd4 Merge pull request #1964 from Limeliz/href-fixes-round-3 
Href fixes round 3
 2013-12-08 07:10:15 -08:00
Pete Goodfellow
9692e1a70c Merge pull request #1973 from KazeEspada/lootfix 
Lootspawner bug fix.
 2013-12-08 04:09:16 -08:00
Aranclanos
c6db228a46 Merge pull request #1936 from Perakp/faceHuggerRuntime 
Fixes alien embryos from runtiming when checking limbs
 2013-12-08 02:41:07 -08:00
Aranclanos
11bf118652 Merge pull request #1982 from Giacom/ghost_colours 
Added anonus' rainbow ghost icons for BYOND member content.
 2013-12-08 02:37:39 -08:00
Aranclanos
5cf0f4765f Merge pull request #1929 from adrix89/Equip 
Quick equip active storage,toolbelt,backpack.
 2013-12-08 02:03:34 -08:00
Aranclanos
8251c0ea42 Merge branch 'HydroTweaksNov2013' of https://github.com/Rolan7/-tg-station into HydroTweaksNov2013 
Conflicts:
	html/changelog.html
 2013-12-08 06:29:48 -03:00
VistaPOWA
1041d7081d Replaces 'aluminum' with 'aluminium'. 
Hopefully there won't be a grammar war because of this.
 2013-12-07 14:42:25 +01:00
Giacomand
eb3f07e538 Added anonus' rainbow ghost icons. 2013-12-05 18:34:24 +00:00
Aranclanos
f6f9f0f050 Removed a leftlover in click code and fixed changeling stings because they weren't working why aren't they working why don't they work, I keep asking that, it's a PR about changelings stings, but they don't work, why they don't work little black ball of destiny, I just want to know why they don't work on the PR that says that they will work, why why why 2013-12-05 07:35:29 -03:00
Aranclanos
a4a13681f3 Merge branch 'master' of https://github.com/Razharas/-tg-station into ImGonnaStingYa 
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
 2013-12-05 07:01:09 -03:00
KazeEspada
4b52884913 Fixes a potential issue with lootspawners who have lootcounts longer than their loot list and lootdoubles not enabled. 2013-12-04 18:10:43 -07:00
Rolan7
530dd03286 Making astroturf and sandstone now automatically stacks all the produced items. 2013-12-04 18:44:49 -05:00
ikarrus
dce8abbd06 Input window will now have the current admin notice displayed when you go edit it. 2013-12-04 08:13:56 -07:00
Perakp
a9d6f493dc Deleted checks from alien_embryo 
No double checks.
 2013-12-04 09:23:21 +02:00
ikarrus
5f15506e38 Admin Notices 
Lets admins set temporary notices that will last until the end of the round.
* All players that join the server will see this notice.
* Anyone can check it using the Adminnotice verb
* Also adds the motd verb that can be used to check the server's message of the day

The intention of this is to make it easier for admins and server hosts to run special events.
 2013-12-03 22:25:28 -07:00
Adrinus
12b43c997e Split up the arcade machines for future expansion. Added Game-Over explanations. A few tweaks and fixes. 2013-12-03 20:12:46 -05:00
Adrinus
26139a0402 Made the Orion Trail machine a subclass of arcade. Added designs for its circuit board. 2013-12-03 19:19:51 -05:00
Perakp
4c9405641a Changed bitflag 'or' to boolean 
| != ||
 2013-12-03 23:25:44 +02:00
Emil
36f1ba5510 Removing href-tags from log_game in say.dm 2013-12-03 21:43:26 +01:00
Perakp
d9f5224646 Changed Del to del 
Proc names are case sensitive
 2013-12-03 13:15:19 +02:00
Emil
a56336a621 Update grenade_launcher.dm 
Removed href-tags from log_game and corrected the log message.
 2013-12-03 09:35:32 +01:00
Aranclanos
397af68100 Merge pull request #1946 from Limeliz/master 
Removes more href-tags from game logs.
 2013-12-02 13:54:42 -08:00
Giacom
8d1a0fd552 Merge pull request #1943 from YotaXP/Fixes-1867 
Fixes Issue #1867
 2013-12-02 13:44:45 -08:00
Aranclanos
fe6f4ff0df Merge pull request #1945 from Giacom/reduce_getturf 
Reduces the amount of get_turf calls.
 2013-12-02 12:59:04 -08:00
Razharas
eb8b23b873 Fixed some issues 
Removed all item stings legacy
Removed game balance changes
Moved stings handling to AltClickOn, added the dead check i forgot to
add
Reverted monkeyizing keeping items from previous form
Fixed the grammar in the comments
 2013-12-03 00:45:05 +04:00
Aranclanos
d4a4a817d4 Merge pull request #1922 from TZK13/Mushroom-Adjustments 
Adjustments to mushrooms
 2013-12-02 12:41:34 -08:00