cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 13:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,961 Commits 61 Branches 14 Tags
38605d1aeee51f1e4b9c364b0b30c6e825252c3c
Commit Graph

2360 Commits

Author SHA1 Message Date
Swag McYolosteinen
b5e4eefe8b Merge pull request #11685 from bgobandit/fuckingprogressbarsfuck 
Mop progress bar now actually works.
 2015-09-13 17:30:50 +02:00
Fox-McCloud
9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
bear1ake
c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero 
Conflicts:
	code/modules/research/protolathe.dm
 2015-09-12 21:07:40 +09:00
Fox-McCloud
89fa65c127 Fixes Consistency Issue with Materials 2015-09-12 03:51:33 -04:00
Razharas
3a63c31614 Merge pull request #11626 from Memendia/master 
Suicide txt fix
 2015-09-11 14:16:30 +03:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
bgobandit
4efae3bc02 Mop progress bar now actually works. 2015-09-09 22:04:47 -04:00
bgobandit
b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa 
Conflicts:
	code/modules/assembly/flash.dm
 2015-09-09 14:04:41 -04:00
Memendia
046b7fbad3 I told ya 2015-09-07 03:40:07 -07:00
bgobandit
c5984f4359 Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41G.dmm
 2015-09-06 13:27:51 -04:00
Razharas
93b9f96cfa Merge pull request #11341 from bgobandit/suicideisnotajoke 
Adds/tweaks several suicide messages.
 2015-09-06 06:42:00 +03:00
bgobandit
362157a5d5 t y p o h o n k 2015-09-04 22:21:51 -04:00
bgobandit
261494e659 Made some changes and repathing for posters. 2015-09-04 18:30:58 -04:00
c0
df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
bgobandit
1748a8c261 ADDS EXTRA HONK 2015-09-03 14:34:53 -04:00
bgobandit
ca34015b85 Removes minibomb suicide message. Fixes wand suicide message. 2015-09-02 23:07:40 -04:00
Razharas
bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE 
Makes all Destroy() procs return properly
 2015-09-01 15:54:18 +03:00
Razharas
30ac2634f4 Merge pull request #11250 from GunHog/Malf_RCD-defense 
Buffs RCD Disable Malfunction ability
 2015-09-01 11:50:17 +03:00
duncathan
48b67e5a25 Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE 
Conflicts:
	code/game/objects/effects/landmarks.dm
 2015-09-01 00:11:33 -06:00
bgobandit
d23f2cb622 mats for toolboxes, glasses and flashes; adjusts coin amounts up slightly 2015-08-31 12:14:34 -04:00
bgobandit
084965803a Circuit boards now give glass, not gold. Adds materials to AI modules and coins. 2015-08-31 09:37:44 -04:00
xxalpha
3f29a9866c Merge remote-tracking branch 'upstream/master' into qdelFixes 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2015-08-31 08:52:30 +01:00
duncathan
51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Razharas
d1c417e996 Merge pull request #11416 from xxalpha/airlockQDEL 
Added qdel(wires) to a bunch of objects Destroy proc.
 2015-08-31 00:08:27 +03:00
Cheridan
32d74ad19c Merge pull request #11433 from Core0verload/framed 
Buttons and wall frames rework
 2015-08-30 13:43:19 -05:00
bgobandit
020ea5d262 Adds materials to some items for recycling purposes. 2015-08-30 14:28:56 -04:00
c0
97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03:00
xxalpha
3379cb8145 Fixed cyborg modules, cyborg parts and cyborgs not qdelling properly. 2015-08-29 19:24:36 +01:00
Cheridan
7f0f74f100 Merge pull request #11380 from bgobandit/salicyclicassblastusa 
Fixes burn kits containing salicyclic acid pills. Adds new burn medication.
 2015-08-27 23:53:58 -05:00
xxalpha
19947d4fa0 Added qdel(wires) to a bunch of objects Destroy proc. 
Return ..()
 2015-08-27 11:10:58 +01:00
bgobandit
4fe28339c5 Makes requested changes. 2015-08-26 18:37:14 -04:00
Aranclanos
38e6a09cf9 Merge pull request #11351 from Core0verload/nodirt 
Removes dirt from walking on tiles
 2015-08-26 06:27:31 -03:00
bgobandit
6ab2443255 Adds oxandrolone, a new burn medication designed to work upon ingestion. Adds oxandrolone to burn kits. Adds changelog. 2015-08-25 13:46:05 -04:00
bgobandit
132adf3f00 adds silver sulf syringes instead of kelotane pills 2015-08-24 21:45:18 -04:00
bgobandit
ce8722b868 Fixes burn kits containing salicyclic acid pills. 2015-08-24 21:36:50 -04:00
c0
9cfb246e4f Removes dirt from walking on tiles 2015-08-24 11:33:52 +03:00
bgobandit
4909600303 Adds/tweaks several suicide messages. 2015-08-23 15:02:34 -04:00
Aranclanos
dd6e735e71 The remove_from_storage() call from handle_atom_del() will stop dropping the objects on null, to avoid having other storage objects with items inside in a null location. 2015-08-21 07:14:56 -03:00
Aranclanos
6f4c89c5ff Fixes the nuclear disk from not spawning under really specific circumstances 2015-08-21 05:22:20 -03:00
GunHog
60c9106f05 Merge remote-tracking branch 'remotes/upstream/master' into Malf_RCD-defense 
Conflicts:
	code/game/gamemodes/malfunction/Malf_Modules.dm
 2015-08-19 09:56:16 -05:00
GunHog
489be2d3e1 RCDs now EXPLODE! 
- Made RCDs explode instead of simply disabled!
- Minor explosion power.
- Adds a five second warning to get rid of the RCD before it blows.
- Added a small cooldown.
 2015-08-19 09:47:20 -05:00
Swag McYolosteinen
825b5794c7 Merge pull request #11239 from Firecage/del2qdel 
del() to qdel()
 2015-08-19 11:50:24 +02:00
Jordie
a433f43b05 Merge pull request #11261 from Memendia/master 
C4 text fix
 2015-08-19 18:58:31 +10:00
Remie Richards
f26874a654 Merge pull request #11230 from SconesC/defib-c 
Adds some clarity to a defib message when confronted with extreme tissue damage
 2015-08-18 20:31:50 +01:00
Remie Richards
3c46b36cc4 Merge pull request #11218 from duncathan/ihatethisfilesomuch 
Cleaning up construction.dm; very minor change to RPD
 2015-08-18 20:29:51 +01:00
Remie Richards
3891e67d8d Merge pull request #11162 from Core0verload/rnd-implants 
RnD update
 2015-08-18 20:20:12 +01:00
Remie Richards
7453449531 Merge pull request #10975 from bustygoku/Backpacks-Slotstuff 
Changes Backpack Slotcount to 21
 2015-08-18 20:14:16 +01:00
Memendia
9ecee2251b Grammar Fix 
Fixes 
Shiina Kishida activates the C-4 and holds it above  >>>  his  <<< head! It looks like she's going out with a bang!
 2015-08-18 00:42:30 -07:00
GunHog
8b07203a87 Buffs RCD disable Malf power 
- Halfed cost to 25 processing power
- Can now be used multiple times
- No longer disables Cyborg RCDs
- Fixes the feedback message not showing
- Fixed mech RCDs not being affected by the power
 2015-08-17 11:03:53 -05:00
Firecage
bf13763e3b Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel 2015-08-16 23:34:03 +02:00