cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 04:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,971 Commits 61 Branches 14 Tags
3fca874ea3ea2026b9c08f784bc11fa715da660d
Commit Graph

219 Commits

Author SHA1 Message Date
paprka
6db18cff96 initial commit 2014-09-30 13:41:02 -07:00
Remie Richards
cc85f44ccb Merge pull request #4900 from MrStonedOne/erroageinjudgement 
Fixes some "erros" in the database system
 2014-09-26 23:41:37 +01:00
Swag McYolosteinen
f9e17faca3 Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire 
Repaths clown ore to bananium
 2014-09-24 16:58:23 +02:00
MrStonedOne
e21ed011af Fixes some erros in the database system 
Replaces erro_ with a configurable table prefix system
Defaults to erro_ if not configured, but configuation files default to SS13_
 2014-09-19 13:37:58 -07:00
Cheridan
21dcbb0887 Merge pull request #4836 from Jordie0608/consistencyisthespiceoflifeliketurpentineisforenhancingcolours 
Fixes #4722 Inconsistent formatting in RD machine warnings
 2014-09-19 09:36:39 -05:00
Jordie0608
40e0a52283 Repaths clown ore to bananium 2014-09-19 21:26:50 +10:00
Jordie
b7d903fbda Adds \ back to DA nodrop message 2014-09-18 13:34:16 +10:00
Cheridan
f5bf1ddaa9 Merge pull request #4809 from RemieRichards/Drones 
Ports Drones from NTstation + New Improvements/Features
 2014-09-17 16:56:40 -05:00
Jordie
2bb0f348f4 notice > warning 2014-09-15 18:25:16 +10:00
Jordie
dd39346563 [name]ifies messages and removes debug item 2014-09-15 18:24:34 +10:00
Jordie
cd2cdde82e Spans unlinked message 2014-09-15 18:21:52 +10:00
Jordie
ef95f0094f Added span + [name] 2014-09-15 18:19:58 +10:00
Remie Richards
473bcd1858 Ports Drones from NTstation + New Improvements/Features 2014-09-13 15:02:57 +01:00
Aranclanos
53b938f1c3 The RnD console won't break anymore when the floral gun is possible to build. 2014-09-12 07:35:21 -03:00
Firecage
0948391502 Span classes for files in the following Modules folders: Power, Projectiles, Reagents, Recycling, Research 2014-08-23 02:02:46 +02:00
Aranclanos
b0f0d01d36 Merge pull request #4427 from Cheridan/blow_up 
Advanced Shotshells
 2014-08-17 15:35:08 -03:00
Cheridan
148d16397b Advanced Shotshells 
adds 3 new types of shotgun ammo. make them by crafting the special shell in RND, and then using table-crafting to make the unique ammo.dmi

meteorshot, made with compressed matter cartridges
pulse slugs, shotgun rounds with the properties of a laser weapon.
dragonsbreath rounds, area-of-effect flame weapons.
renames ammunition/bullets.dm to ammunition/ammo_casings.dm, which is more accurate

splits RND designs up into their own files
 2014-08-14 12:15:10 -05:00
scoopscoop
e96f01816c As with the autolathe, the protolathe now builds faster with better manipulators. 2014-08-14 01:58:46 +03:00
scoopscoop
f5b5c7c84f Clamp function fixed 2014-08-13 19:30:35 +03:00
scoopscoop
d521e6e827 Avoids division by zero 2014-08-04 15:58:30 +03:00
scoopscoop
327086b607 Allows the protolathe to build multiples of items. 2014-08-04 15:39:54 +03: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
Alex
2830c8c092 Merge pull request #3961 from paprka/ergoisbackohno 
Improved mining droprates
 2014-07-07 10:28:30 +01:00
Miauw
71e1b38eb5 Adds slot machines. 2014-07-03 19:50:22 +02:00
paprka
c21b6b0e55 sample text 2014-06-20 11:28:48 -07:00
Kelenius
3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
Cheridan
36bb032957 Merge pull request #3509 from Cheridan/MeteorsSuck 
Meteor Stuff
 2014-05-17 18:42:16 -05:00
Alex
8aaa5a4b19 Merge pull request #3602 from GunHog/Advanced_HUDs 
Adds Nightvision Medical and Security HUDs!
 2014-05-14 11:06:03 +01:00
Cheridan
3a0bd3de28 Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck 
Conflicts:
	code/game/turfs/simulated/walls.dm
 2014-05-13 14:03:42 -05:00
GunHog
5fd52bc6a8 Removal of the Locked status from Security HUDs! 2014-04-30 16:39:00 -05:00
GunHog
11942572d7 Adds Nightvision Medical and Security HUDs! 2014-04-30 14:35:39 -05:00
Cheridan
4d8160ab14 meteorhit() is kill 2014-04-22 12:16:02 -05:00
Menshin
80e7d1d0e7 Added a check for "_nodrop_" items for several machines/structures (fix #3407). 2014-04-20 20:49:32 +02: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
GunHog
1366822ec7 Lets Sci make magboots! 2014-04-12 13:53:06 -05:00
Jordie0608
b18cc7d54e Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat 
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi
 2014-04-11 02:51:07 +10:00
Firecage
aad822768f Sensible circuit design names 
Signed-off-by: Firecage <firecage@hotmail.com>
 2014-04-08 14:09:40 +02:00
Firecage
73e8731f5b Standardizing circuitboard design names 2014-04-07 23:01:56 +02:00
Razharas
f7e3737f3f Span classes yaaaaay 2014-04-03 15:37:53 +04:00
Razharas
e86ab01626 Fixes R&D machinery materials adding exploit 
Fixes https://github.com/tgstation/-tg-station/issues/3259
 2014-04-01 21:21:08 +04:00
Jordie0608
79746e115f Wooden Walls 2014-04-01 18:03:02 +11:00
phil235
e682348d53 Adding four boards to the list of R&D circuit designs 
Adds the boards for telecom traffic control console, telescience console, mechbay recharger and vendor to the list of R&D designs.
Fixes some minor typos.
 2014-03-29 18:13:04 +01:00
Ergovisavi
d55d72f049 Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-03-26 18:14:48 -07:00
Mloc-Hibernia
8af8a43d6f Initial pass to convert LF to CRLF 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-03-24 08:53:40 +00:00
MrPerson
6930283efc Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r 
Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm
 2014-03-21 03:05:39 -07:00
Ergovisavi
bb101e80d4 Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-03-19 18:29:10 -07:00
Ergovisavi
57fe8ea3f4 Various mineral/material standardizations, minor mob changes 2014-03-19 18:28:56 -07:00
Emil
05203ba8a1 Added an 'e' to 'Rest'. R&D computer 2014-03-17 17:59:07 +01:00
MrPerson
75353c1681 Stat number of dels per tick 
More del(AM) -> qdel(AM)
 2014-03-08 23:26:33 -08:00