cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-30 11:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,993 Commits 59 Branches 14 Tags
64c19bd2d3c95b0e27bd7112ca679779eaba407b
Commit Graph

16226 Commits

Author SHA1 Message Date
coiax
64c19bd2d3 Adjusts RCD family export prices to be realistic (#18186) 
Fixes #18101. Comments indicate my rough logic, which brings them inline
with the actual cost of materials required to create them, rather than
x10 the amount.

Also still enables their sale rather than just crudely removing them
entirely.
 2016-06-03 14:45:04 -05:00
LatD
143795d230 Fixes imprinter alone not working (#18216) 2016-06-03 14:43:52 -05:00
Kyle Spier-Swenson
afebc5ef97 Fixes ghost image runtime and see_darkness hiding ghosts again. (#18158) 
(also fixes ghost images not garbage collecting.)
 2016-06-03 16:49:08 +02:00
Joan Lung
08f88fbe3e Merge pull request #18159 from coiax/countdown 
Adds ghost visible countdowns for bombs
 2016-06-03 08:55:11 -04:00
Jordie
4c8f8ae53e Merge pull request #18154 from PKPenguin321/plant-analyzer-repath 
Repaths plant analyzers
 2016-06-03 16:41:02 +10:00
PKPenguin321
8e88d2d329 removes obsoleted proc 2016-06-02 23:31:28 -07:00
Razharas
49f812fada Merge pull request #18149 from KorPhaeron/pAI 
pAI ash storm immunity
 2016-06-03 08:09:00 +03:00
oranges
803f414a95 Merge pull request #18130 from coiax/more-manipulator-stuff 
Shuttle manipulator: Added "Fast Travel" button
 2016-06-03 09:11:46 +12:00
oranges
50c625a238 Merge pull request #18143 from lordpidey/Non_mobs_can_go_to_hell 
Bolt of resurrection no longer runtimes on hitting non-mobs.
 2016-06-03 09:10:27 +12:00
oranges
24056f9df3 Merge pull request #18146 from pudl/angela 
Fixes smg magazines icon
 2016-06-03 09:10:04 +12:00
coiax
4d091c010e Adds Asteroid emergency shuttle to station (#18125) 
Wow, this one is a WEIRD one.
 2016-06-02 15:48:08 -05:00
GunHog
6d238a2ff7 Vines fix (#18134) 
Xenos may now eat vines!
 2016-06-02 14:07:16 -05:00
Leo
71136fc76b Fix add custom AI laws (#18138) 2016-06-02 14:04:06 -05:00
Jack Edge
bf3eb118d9 Push 2016-06-02 18:28:46 +01:00
Razharas
9fdae2fe4e Merge pull request #17576 from LatD/Research 
[Ready for test/merge] R&D level remake
 2016-06-02 18:41:43 +03:00
Jack Edge
c5e4865a7e Countdowns, now with some of it working 2016-06-02 16:09:53 +01:00
Jack Edge
9ee4563133 It works 2016-06-02 12:36:04 +01:00
Jack Edge
2df2c6334f Adds ghost visible countdowns for bombs 
🆑 coiax
rscadd: For extra observer drama, ghosts can now visibly see the
countdown of various explosives.
/🆑

- Also updates my build script to take account of the move of dm.sh
 2016-06-02 11:06:59 +01:00
Cheridan
835c35e79e Merge pull request #18111 from optimumtact/restinpeacekeeper 
Removes peacekeeper borgs bolas
 2016-06-02 02:25:33 -05:00
PKPenguin321
cf71a5833f repaths plant analyzers 
so they are no longer children of regular analyzers
 2016-06-01 22:44:03 -07:00
KorPhaeron
3e3b6268e8 pAI ash storm immunity 2016-06-01 22:32:21 -05:00
oranges
16c77c484c Merge pull request #18118 from MMMiracles/pizzaparty 
Lavaland Pizza Party
 2016-06-02 13:40:08 +12:00
pudl
74a5ff30ad Another one bites the dust 2016-06-01 20:04:46 -05:00
Mike Long
2a464a3e42 Neatens code 2016-06-01 19:48:14 -04:00
Mike Long
5c6a2490af Bolt of resurrection no longer runtimes on hitting non-mobs. 2016-06-01 19:11:37 -04:00
KorPhaeron
5db8a76217 Revert "Updates some lavaland ruins and adds new ones." 2016-06-01 16:47:16 -05:00
oranges
ce5bd19adb Merge pull request #18107 from lordpidey/lavaland_changes 
Updates some lavaland ruins and adds new ones.
 2016-06-02 09:07:32 +12:00
oranges
c27a9a21bb Merge pull request #18070 from PKPenguin321/clothing-by-nienhaus 
Adds letterman jackets
 2016-06-02 09:01:29 +12:00
Cheridan
5e2348fd75 Merge pull request #18077 from KorPhaeron/beepsky_fix2 
Fixes beepsky cuffing people with no arms
 2016-06-01 12:49:40 -05:00
KorPhaeron
760803fe39 Changes return 0 to return FALSE 2016-06-01 12:23:50 -05:00
Jack Edge
b92332053f Shuttle manipulator: Added "Fast Travel" button 
🆑 coiax
rscadd: The shuttle manipulator now has a Fast Travel button, for those
admins that really want a shuttle to get to where its going FAST.
/🆑

Also fixes a runtime because I missed a case in the shuttlemode2str
proc.
 2016-06-01 15:58:18 +01:00
oranges
6f866590b1 Merge pull request #18081 from KorPhaeron/create_antag 
Create Antagonist Fix
 2016-06-01 19:44:03 +12:00
oranges
2dd5f76f30 Merge pull request #18084 from hornygranny/edge_case_dont_real 
fixes singularity expanding and eating containment
 2016-06-01 19:42:50 +12:00
Cheridan
294eab14a0 Merge pull request #18088 from coiax/fix-18061 
Mobs only take damage once from a shuttle roadkill
 2016-06-01 02:05:05 -05:00
Cheridan
9b8c68e704 Merge pull request #18065 from coiax/blood-box 
Adds "blood freezer" to map; replaces freezer of blood packs
 2016-06-01 00:51:52 -05:00
TechnoAlchemist
6878e9fddb Adds luminosity to lasers and sparks. (#18090) 2016-05-31 21:18:09 -05:00
MMMiracles
5f773abf9b sorry timmy 2016-05-31 21:21:23 -04:00
Joan Lung
7259a6370c Merge pull request #18086 from KorPhaeron/Igotpaid30dollarstodothis 
New Chaplain Weapons + Mass Driver buff
 2016-05-31 19:54:54 -04:00
oranges
5cbce38a55 Removes peacekeeper bola snare 2016-05-31 23:21:18 +00:00
oranges
7d3e3d0b85 Merge pull request #17832 from KorPhaeron/animes 
Just like one of my japanese animes
 2016-06-01 10:15:59 +12:00
oranges
5aa4d2710d Merge pull request #18022 from Xhuis/kaput_bird 
Fix bundle
 2016-06-01 10:15:13 +12:00
oranges
ebe8aa284a Merge pull request #18068 from RemieRichards/is_type_in_FUCK 
Typecaches and is_type_in_list() fixes
 2016-06-01 10:14:31 +12:00
oranges
83b3faf72f Merge pull request #17676 from Core0verload/they-are-taking-our-jobs 
Adds two new modes to cleanbots, allows playerbots to use emag functions
 2016-06-01 09:56:13 +12:00
oranges
687cd053e7 Merge pull request #18082 from hornygranny/abhorrent_level_of_power_creep 
aliens break cuffs instantly
 2016-06-01 09:46:21 +12:00
hornygranny
0ae9ecb91c Update carbon.dm 
MUH DEFINES
 2016-05-31 14:17:24 -07:00
oranges
2544171982 Merge pull request #18058 from lordpidey/bottlefix 
Fixes condiment bottles losing name upon refilling.
 2016-06-01 09:17:05 +12:00
Mike Long
f18fdbf73e Fixes wrathhand giving a ranged gib. 
Fixes spelling/punctuation on wrathhand.
Removes erroneous include.
 2016-05-31 15:43:51 -04:00
Cheridan
1e4585bd86 Merge pull request #17923 from Shadowlight213/dronelight 
Doubles drone light brightness
 2016-05-31 13:59:52 -05:00
hornygranny
8a65c7e6ec >it's a refactor everything while you're at it episode 2016-05-31 11:55:59 -07:00
KorPhaeron
d4240c5378 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Igotpaid30dollarstodothis 
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
 2016-05-31 12:03:01 -05:00