cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-06 22:39:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,905 Commits 63 Branches 14 Tags
5e79b65ce73a7c0a7a6fa439fdb2fb4ece0bdb26
Commit Graph

11302 Commits

Author SHA1 Message Date
vuonojenmustaturska
34c70340f9 Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#38852) 
* a commit message

* reviews addressed?
 2018-07-03 18:02:16 -04:00
Jordan Brown
041cd94994 Merge branch 'pr-38868' 
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
 2018-07-03 13:54:27 -04:00
zxaber
58e1e75921 Allows empty borg shells to be disassembled. (#38639) 
* Adds the ability to deconstruct empty cyborg shells.

* Update robot_parts.dm

* Able to directly swap cells

Added ability to change out power cells with a screwdriver.

* Update robot_parts.dm

* Removing unnecessary `src` prefixes from code.

* Update robot_parts.dm

* Moved to wrench_act and screwdriver_act overrides

I think I did this right

* Replaced screwdriver code

* Swapping out qdeleted for an if-not

* Adds a check for cell-less shells when MMI is added.

* Update robot_parts.dm

* Adds the ability to just remove the cell

Re-organized the screwdriver section as well, and added the ability to add a cell to a shell with no cell.

* Whoops

Copypaste error

* Changed the screwdriver section from nested if statements to use a function

Also removed the line that forced the naked endoskeleton out of your hand in the wrench section.
 2018-07-03 13:15:35 -04:00
MrDoomBringer
21beb6373f Fixes runtimes when using supplypod smite on ghosts and fixes supplypod-smite hotspot effects. (#38634) 
* ez pz lemin squizi

* oooooooooh

* I DIDNT COMPILE MY CODE

* I DIDNT COMPILE MY CODE

* cyberboss i love u tho
 2018-07-03 13:12:51 -04:00
oranges
bdada64657 Merge pull request #38835 from AutomaticFrenzy/patch/watertank 
Fix backpack water tank behavior, related fixes
 2018-07-03 12:52:40 +12:00
AnturK
e712e82244 Fixes some shard harddel stuff. (#38799) 2018-07-02 09:43:04 -04:00
AnturK
9875f19053 Should look before simplyfing names 2018-07-02 14:32:05 +02:00
AnturK
8710320ff2 Fixes blueprint overlays. 2018-07-02 14:12:42 +02:00
Jordan Brown
e34100dc54 Merge pull request #38832 from AutomaticFrenzy/patch/light-tile 
Fix light tile creation
 2018-07-02 06:26:11 -04:00
Dennok
4f64081276 deconstructable-TEG (#38656) 
Make TEG deconstructable.
 2018-07-01 00:59:34 +03:00
Tad Hardesty
6e72c777bf Fix backpack water tank behavior, related fixes 2018-06-30 14:49:13 -07:00
Tad Hardesty
211978cbb2 Fix light tile creation 2018-06-30 12:33:49 -07:00
ShizCalev
7d737259e0 Fixes PDA ID teleporting (#38795) 2018-06-30 12:09:29 -07:00
TerraGS
f72bc7781b Updates plastic flaps icon and cleans up its code (#38751) 
cl
imageadd: New icon for plastic flaps that actually looks airtight.
code: Update to plastic flaps code to use tool procs rather than attackby and removed two pointless states.
/cl

Gives plastic flaps an airtight look to fit their new property. Removes two defines that were just a functional copy of anchored. Replaces calls to attackby() with screwdriver_act() and wirecutter_act().
 2018-06-30 23:25:13 +12:00
ShizCalev
4cc1c5214e Cleans up leftover telesci teleporter code (#38789) 2018-06-30 01:54:20 -07:00
ShizCalev
c33c2f725e Fixes TGUI runtime (#38797) 
ui_interact was being called on usr instead of M
 2018-06-30 01:21:03 -07:00
Jordan Brown
26b6fab1fe Merge branch 'pr-38604' 
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
 2018-06-28 14:22:03 -04:00
Jordan Brown
fc948d41eb Merge branch 'pr-38698' 
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
 2018-06-28 14:22:02 -04:00
Jordan Brown
ccfb1d2365 Merge branch 'pr-38757' 
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
 2018-06-28 14:21:57 -04:00
Jordan Brown
2ecd5c6809 Merge branch 'pr-38765' 
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
 2018-06-28 14:21:56 -04:00
ShizCalev
964b748919 Fixes ID console exploit (#38768) 2018-06-28 21:17:39 +03:00
Anonmare
68edd12174 It just occured to me the line is unnecessary 2018-06-28 00:33:43 +01:00
Anonmare
ae8c799cd8 Dulls the possessed Chainsaw's blade 2018-06-27 18:41:50 +01:00
AnturK
57028bfa4b Adds missing TIMER_UNIQUE to TIMER_OVERRIDE 2018-06-27 12:54:02 +02:00
oranges
6827d79a6b Merge pull request #38673 from ninjanomnom/kevin-cleanup-crew 
Some uplink component GetComponent cleanup
 2018-06-27 20:54:33 +12:00
Nich
40e071e71e Revert "Makes the TEG deconstructable" (#38616) 
* Revert "Makes the TEG deconstructable (#38056)"

This reverts commit 67ff23a9a1.

* Revert "Automatic changelog generation for PR #38056 [ci skip]"

This reverts commit 36d5170868.
 2018-06-27 20:49:31 +12:00
Dax Dupont
278f4d7429 anal 2018-06-26 23:46:15 +02:00
ShizCalev
89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
Tad Hardesty
47f55b48a7 Move throwforce up to atom/movable (#38689) 2018-06-26 16:26:33 -04:00
Jordan Brown
ba28c1f920 Merge pull request #38644 from AutomaticFrenzy/patch/cameranet 
Port AI static to vis_contents
 2018-06-25 21:22:58 -04:00
vuonojenmustaturska
e2073a7347 cleanup 2018-06-24 21:42:06 +03:00
cinder1992
9e5769be7b Added Officer's Sabre suicide (#38662) 
* Added Officer's Sabre sucide

* Oopsie

* Brute for the Brute God!

* pick_n_take is a thing

* Cleanup

* Cleanup 2: Electric Boogaloo

* Sabre suicide covers all arms and legs

* Suicides now take the same ammount of time for users with more than two arms and two legs
 2018-06-24 10:44:27 -04:00
Dax Dupont
63b0e46a63 Wat zullen we drinken Zeven dagen lang Wat zullen we drinken, wat een dorst Wat zullen we drinken Zeven dagen lang Wat zullen we drinken, wat een dorst Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Dan zullen we werken Zeven dagen lang Dan zullen we werken, voor elkaar Dan zullen we werken Zeven dagen lang Ja zullen we werken, voor elkaar Dan is er werk voor iedereen Dus werken we samen Zeven dagen lang Ja werken we samen, niet alleen Dan is er werk voor iedereen Dus werken we samen Zeven dagen lang Ja werken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Eerst moeten we vechten Niemand weet hoe lang Eerst moeten we vechten, voor ons belang Eerst moeten we vechten Niemand weet hoe lang Eerst moeten we vechten, voor ons belang Voor het geluk van iedereen Dus vechten we samen Samen staan we sterk Ja vechten we samen, niet alleen Voor het geluk van iedereen Dus vechten we samen Samen staan we sterk Ja vechten we samen, niet alleen 2018-06-24 14:45:07 +02:00
ninjanomnom
bbb4147aa2 Some uplink component GetComponent cleanup 2018-06-23 01:41:34 -04:00
Jordan Brown
6a603b733d Ports more things to Initialize (#38653) 2018-06-22 16:56:09 -07:00
praisenarsie
8ffe48a336 fixes them not showing up 2018-06-22 16:40:40 +01:00
praisenarsie
82694bcf3b Credits the original author + moves shuttle chairs to goon/icons 2018-06-22 16:31:15 +01:00
Jordan Brown
3eb3f741ad Merge pull request #38636 from DaxDupont/chairs 
ports shuttle chairs from ftl
 2018-06-22 10:30:22 -04:00
Tlaltecuhtli
24b21b8416 [READY] better contraband crates (#38321) 
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
 2018-06-22 11:51:29 +12:00
kevinz000
961fbfc99a Fixes and adds blast cannons to traitor science uplink items (#38093) 
rscadd: Blast cannons have been fixed and are now available for purchase by traitorous scientists for a low low price of 14TC.
rscadd: Blast cannons take the explosive power of a TTV bomb and ejects a linear projectile that will apply what the bomb would do to a certain tile at that distance to that tile. However, this will not cause breaches, or gib mobs, unless the gods (admins) so will it.
experimental: Blast cannons do not respect maxcap. (Unless the admins so will it.)
 2018-06-22 11:38:29 +12:00
YPOQ
d4136f4a65 Fixes gulag stacker not giving points after RPG loot event (#38570) 
* Fixes gulag stacker not giving points after RPG loot event

* Moves point values to type vars

* cleanup
 2018-06-21 17:30:13 -04:00
Tad Hardesty
149e9fb7ae Port fire axe and extinguisher cabinets to Initialize (#38640) 2018-06-21 21:55:30 +03:00
Tad Hardesty
b754e47b09 Tidy up cameranet code slightly 2018-06-20 21:58:58 -07:00
ShizCalev
f338f09207 Cleanup & corrections 2018-06-20 21:57:17 -04:00
AnturK
41dbcba0db Fixes AI's being unable to call shuttle using comm console. (#38534) 
* Fixes AI's being unable to call shuttle using comm console.

* Lets get rid of double negatives

* viewvers for
 2018-06-20 17:38:51 -07:00
Dax Dupont
d0ccc6753c ports shuttle chairs from ftl 2018-06-20 23:45:00 +02:00
Jordan Brown
cb0f3a8a6f Merge pull request #38609 from AnturK/missedthatinreviewwhoops 
Fixes chemnade logging and cleans up the reagent stringify helper
 2018-06-20 10:26:18 -04:00
Jordan Brown
a4a6d3ec77 Merge pull request #38549 from AutomaticFrenzy/patch/vending-machines 
Improve how vending machine restocking works
 2018-06-19 19:44:22 -04:00
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
Jordan Brown
84a85a5a3a Merge pull request #38574 from ninjanomnom/glob-signals 
Global component signals
 2018-06-19 18:18:11 -04:00