cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 17:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,597 Commits 61 Branches 14 Tags
4e84fb2eeff70cd10e9ccfcd6042889d0ea1653b
Commit Graph

717 Commits

Author SHA1 Message Date
tkdrg
6a0f1be7cd Merge pull request #6584 from phil235/HoloSwordFix 
Fixes being able to smash grille/newscaster/mirror/lights with holo esword
 2015-01-01 16:39:16 -03:00
tkdrg
34c4c02777 Merge pull request #6646 from RemieRichards/TerminalDecon 
Terminal Deconstruction
 2014-12-31 21:47:47 -03:00
Remie Richards
341b147088 You can now deconstruct terminals provided the APC or SMES is prepared for this (eg, open panels, exposed wires etc.) 2014-12-31 23:35:07 +00:00
tkdrg
cdb5066502 Merge pull request #6324 from Razharas/GenShit 
Added datum mutations
 2014-12-31 17:24:15 -03:00
phil235
6cf7cd2c0b Merge pull request #6671 from tkdrg/fuckingSuperMatter-i_SwearTo=god'ThisdamnthingaaA 
Fixes supermatter division by zero runtime
 2014-12-31 15:42:10 +01:00
Razharas
d1f347f584 Fixes conflicts 
There werent even any conflicts really, but git for some reason thought
there are
 2014-12-30 15:12:09 +03:00
Perakp
ee3617310e Merge remote-tracking branch 'upstream/master' into droneFix 2014-12-30 13:32:51 +02:00
hornygranny
9ee5d52814 Merge pull request #6601 from paprka/walkthecat 
Adds catwalks
 2014-12-29 19:05:41 -08:00
tkdrg
bdbde78470 Fixes supermatter division by zero runtime 2014-12-29 21:48:21 -03:00
Razharas
f7e6552e33 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-29 17:05:20 +03:00
tkdrg
80cc2d4100 Merge pull request #6622 from Thunder12345/grammarFixes 
Fixes for some grammer and formatting issues
 2014-12-29 10:20:35 -03:00
Razharas
76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
 2014-12-28 11:20:15 +03:00
Razharas
208b59c30e Fixed stuff tkdrg pointed out 
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
 2014-12-28 10:49:04 +03:00
paprka
79e2eedacb Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2014-12-27 22:26:21 -08:00
Thunder12345
744940c8a8 Fixes #6615 
All instances of "Your clothes feel warm" have been given a full stop.
Couldn't actually confirm in testing due to never getting the warm
clothes message, but I don't see why it wouldn't work.
 2014-12-27 18:32:45 +00:00
phil235
f8b7a2066f Merge pull request #6559 from tkdrg/hal 
Adds sanity checks to supermatter Consume()
 2014-12-27 18:42:01 +01:00
paprka
0e4903bd83 Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2014-12-26 18:35:12 -08:00
paprka
3ca6d769a1 adds catwalks 2014-12-26 17:38:55 -08:00
paprka
3f41ca1a9a further code optimizations in cable.dm 2014-12-26 09:26:56 -08:00
tkdrg
adb8989327 Nerfs the supermatter explosion back to 3, 7, 14 
Request by a headcoder and a server host.
 2014-12-25 19:47:36 -03:00
paprka
404da4dbdd code optimizations 2014-12-25 13:28:05 -08:00
paprka
a6acdeb3c2 initial commit 2014-12-25 13:07:06 -08:00
tkdrg
8121ac9dba Adds sanity checks to supermatter Consume() 
It should only eat /mob/living and non-effect /obj now.
Fixes #6558
Also fixes the division by 0 runtime for real now.
 2014-12-25 14:56:36 -03:00
MrPerson
d8b85dda0a Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake 
refactors narsie
 2014-12-24 19:48:24 -08:00
phil235
4374e46cdd Fixes being able to smash grille/newscaster/mirror/lights with holo esword. 2014-12-24 23:50:20 +01:00
Razharas
9a27fe7c8d Conflict fix 
Yeah makes it all work
 2014-12-21 06:12:33 +03:00
hornygranny
579f297076 Merge pull request #6444 from tkdrg/shardopplsnerf 
Tweaks the Supermatter a bit
 2014-12-19 14:57:22 -08:00
tkdrg
d7e05d4387 Adds Supermatter logging and tweaks the power gen 
Now includes an admin_investigate entry, plus three message_admins():
when first powered, when first reaching critical point, and when a mob
is dusted. Also tweaks the power generation formula a bit.
 2014-12-19 18:19:48 -03:00
Hornygranny
cd22bfc11f refactors narsie to use the object oriented programming meme 2014-12-18 11:44:20 -08:00
Cheridan
62252f0273 Merge pull request #6420 from phil235/TypoFix2 
Fixes a lot of "the the" in messages.
 2014-12-17 16:06:35 -06:00
tkdrg
c0fb78edd5 Tweaks the Supermatter a bit 
Reduces the amount of heat and power released. Removes redundant code.
 2014-12-17 16:06:33 -03:00
hornygranny
5a26db0285 Merge pull request #6401 from Menshin/solars_runtime_fix 
Fixes controless solar tracker runtime
 2014-12-17 11:04:29 -08:00
phil235
d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
Remie Richards
c021bda843 Merge pull request #6250 from tkdrg/CRYSTAL-DELAMINATION-IMMINENT 
Ports the supermatter engine from /vg/
 2014-12-16 15:26:36 +00:00
Menshin
672b476f23 Tidying a little 2014-12-16 13:16:19 +01:00
Menshin
51e10e6a19 Fixes controless tracker runtime 2014-12-16 01:23:29 +01:00
Razharas
f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution
 2014-12-16 02:52:08 +03:00
Razharas
0b26a71a71 Merge pull request #6333 from tkdrg/singulobj 
The singularity/narsie are no longer machines
 2014-12-14 10:02:39 +03:00
Razharas
44cc6c6d97 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-14 03:07:13 +03:00
tkdrg
79e8ad4142 The singularity/narsie are no longer machines 2014-12-12 19:42:37 -03:00
Razharas
8d110ee496 Tiny clean up, still lots of work to do 
Only compiletested, these changes were never tested in the game yet
 2014-12-12 23:57:11 +03:00
tkdrg
358ca52d27 Adds one span class. 2014-12-11 15:30:37 -03:00
Hornygranny
99f364f480 makes APC call parent 2014-12-09 18:53:29 -08:00
Hornygranny
af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2014-12-09 16:03:45 -08:00
tkdrg
0c5641d016 Ports the supermatter engine from /vg/ 
The SM was originally developed for bay12, but I ported the /vg/ fork.
Basically, it eats heat or atom/movables and generates radiation/power.
Everything that touches it turns to dust. If it overheats, it explodes.
Typical usage involves emitters and a cooling chamber.
Currently, these are only obtainable through cargo for 100 points.
The crate comes locked and requires CE access.
 2014-12-07 09:43:36 -03:00
Razharas
7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
Cheridan
f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat 
Standardizing attack messages to always show the attacker first
 2014-12-04 12:45:31 -06:00
Razharas
b9b73531a6 Merge pull request #6104 from tkdrg/bouncy 
Stops the field from bouncing the sing around
 2014-12-01 18:14:12 +03:00
Perakp
7f357963bd - Fixes belts getting stuck in drone inventory. Fixes #5563. 
- Gives drones the ability to interact with APCs and air alarms without requiring them to have an ID card. Fixes #5565.
- Drones have to be adjacent to the APC/alarm when using it, for balance.
 2014-11-29 14:36:36 +02:00
tkdrg
65fb61be69 Stops the field from bouncing the sing around 2014-11-27 10:33:24 -03:00