cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,528 Commits 61 Branches 14 Tags
e992c0dac6fdb4e1c317dcbc5ebc5baaa2bc6c47
Commit Graph

35347 Commits

Author SHA1 Message Date
QualityVan
e992c0dac6 Capitalizes machine names when they talk on radio channels 2017-05-02 14:58:11 -04:00
oranges
37cd6e41f6 Merge pull request #26775 from Cyberboss/patch-63 
Fixes atom spawning
 2017-05-02 09:11:09 +12:00
oranges
162ca92e51 Merge pull request #26140 from coiax/arbitary-machine-occupant 
Changes /obj/machinery to have atom/movable occupants
 2017-05-02 08:58:19 +12:00
Joan Lung
c6ed089214 Merge pull request #26779 from Thunder12345/revert-26739-patch-72 
Revert "You can no longer queue up ahelps by queing up prompts"
 2017-05-01 16:10:08 -04:00
Thunder12345
a7c10b052c Revert "Fixes Ahelp queing (#26739)" 
This reverts commit 0c1620d32c.
 2017-05-01 20:58:38 +01:00
Cyberboss
574c3dd19b Fixes atom spawning 2017-05-01 14:43:17 -04:00
Emmett Gaines
ad6f0c818c Subsystem change for the SM and TEG and slight QoL (#26477) 
* Port

* Why the fuck did I think fixing merge conflicts with the web editor was a good idea. The 2 minute before sleep commit

* Remove from subsystem on destroy

* Woops
 2017-05-01 12:05:06 -06:00
Jack Edge
44991e125a Removal of checks II 
- VR sleepers are human only.
 2017-05-01 19:01:16 +01:00
Jack Edge
564ee21d42 Removal of checks I 2017-05-01 19:01:15 +01:00
Jack Edge
7cb8007556 Changes /obj/machinery to have atom/movable occupants 
Currently `occupant` in /obj/machinery is a /mob/living type. I have
changed it to /atom/movable, and made a type cache to determine what to
"look for" when `close_machine()` is called.

This means that machines can have non-mob occupants. I have some design
ideas for this, but that's after the freeze.
 2017-05-01 19:00:07 +01:00
Cyberboss
9d0185c023 Allows admins to pass parameters to New() (#26613) 
* /proc/print_single_line(list/L)

* Admin datum/New parameters

* Fixes
 2017-05-01 11:55:58 -06:00
QualityVan
02c9cb5df0 Saline-glucose changes (#26556) 
* Refactors saline glucose solution to work as temporary blood instead of increasing blood regeneration.

* Prevents salglu from replacing all of your blood

* Added terrible deadly overdose effects

* consumption rate is probably fine as is, really
 2017-05-01 11:54:44 -06:00
Cyberboss
1ed59144bc Holocalls (#25743) 
* Port holopads to Initialize

* Small optimization

* Holocalls

* What dunc said

* Revert "What dunc said"

This reverts commit dd9f26762aab86c3ce981fd7deab700299d4ed94.
 2017-05-01 11:52:49 -06:00
Joan Lung
82c20c0bc6 Clockcult component generation will automatically focus on components needed to activate the Ark (#25596) 
* Clockcult component generation will focus on components needed to activate the Ark

* I=/=i

* whoops
 2017-05-01 11:50:01 -06:00
Joan Lung
4a8fcdd395 Belligerent now prevents you from running even between chants (#25458) 
* quick!

* Belligerent now prevents you from running even between chants

* one fuckup and git turns into a screaming hellspace populated only by pain

* glob

* seven seconds of pain
 2017-05-01 11:48:55 -06:00
Cyberboss
f35fa9f2d3 PR announcement spam prevention (#24002) 
* PR announcement spam prevention

* Use the payload

* Update world.dm

* Update world.dm
 2017-05-01 11:46:30 -06:00
Profakos
b3f587409d Ore redemption machine cleanup (#26708) 
* Ore redemption machine uses material containers

* ORM won't send messages when empty

* QDEL_NULL for datums, and removes some unused lists
 2017-05-01 10:53:37 -06:00
Cyberboss
abf59e153f Moves tips from config to strings tree (#26722) 
* Moves tips and deadmin names from config to strings tree

* Just the tip
 2017-05-01 10:51:10 -06:00
Joan Lung
b732c9723a Small fixes to spatial gateways (#26738) 
* Small fixes to spatial gateways

* this too
 2017-05-01 10:38:22 -06:00
Cyberboss
0c1620d32c Fixes Ahelp queing (#26739) 2017-05-01 10:37:39 -06:00
Cyberboss
d6c8ce6d9e Port SM shards to initialize (#26740) 2017-05-01 10:37:07 -06:00
Leo
1e75ea5c98 Merge pull request #25603 from ChangelingRain/gainvanguard 
Gaining Vanguard will remove existing stuns
 2017-05-01 13:06:55 -03:00
Joan Lung
e424b787e5 Merge pull request #26729 from ExcessiveUseOfCobblestone/patch-1 
Gang Pen Is now Stealthy
 2017-05-01 12:04:18 -04:00
4dplanner
9856a1d429 Makes surplus crates less likely to contain implants (#26737) 
* Makes surplus crates less likely to contain implants

* Style points
 2017-05-01 09:38:32 -04:00
FantasticFwoosh
583fbe68f1 Fixes the 'stuffed legion' recipie (#26735) 
* Fixes stuffed legion food crafting

No longer relies on a null object for crafting, now uses appropriate indeterminate legion soul

* Delete food.dmi

* Fixes typo for Stuffed Legion

Fixes a typo with "stuffed legion" food not having a appropriate underscore like in the code "stuffed_legion"
 2017-05-01 15:36:56 +02:00
Really-Good-Soda-Flavor
20ac81d9a5 A bunch of sparks to do_sparks (#26728) 
* A bunch of sparks to do_sparks

* Whoops!
 2017-05-01 09:35:18 -04:00
swindly
db7b290351 changes mercury and lithium (#26731) 2017-05-01 09:34:42 -04:00
Joan Lung
57f8e92957 Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass (#26725) 2017-05-01 00:23:50 -03:00
kevinz000
0d344cc29e Buffs jump boot dash speed (#26663) 2017-04-30 21:06:13 -03:00
bawhoppen
94d63eba9b Readds deepstorage w/ tweaks AND adds water bottles to vending machines (#26709) 2017-04-30 21:00:24 -03:00
Leo
89e60cb88f Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted (#26720) 2017-04-30 23:35:13 +02:00
Leo
8958aca8f9 Merge pull request #26719 from Cyberboss/patch-70 
Fixes some null.add_reagents runtimes
 2017-04-30 18:31:57 -03:00
Leo
a7603e4aba Winter Wonderland holodeck no longer has freon, and it's no longer restricted. (#26718) 2017-04-30 16:12:45 -04:00
Joan Lung
37b25824d6 Merge pull request #26717 from lzimann/minddatum 
Moves antag datums to the mind
 2017-04-30 15:31:12 -04:00
Lzimann
66d186b61c Remove and apply innate effects are now applied when the mind is transfered to a new body 2017-04-30 16:21:45 -03:00
Leo
2fca063698 Merge pull request #26715 from kevinz000/patch-136 
Makes fire not able to become ice.
 2017-04-30 14:22:26 -03:00
Leo
1250a1ff75 Merge pull request #26713 from Cyberboss/patch-69 
[s] SDQL security patches
 2017-04-30 13:30:27 -03:00
Leo
7fa3fb4fc8 Merge pull request #26680 from Cyberboss/mob_directory 
Mob directory
 2017-04-30 13:26:21 -03:00
Leo
87292bb007 Merge pull request #26691 from QualityVan/brainfixes1 
Fixes changelings being unable to revive from death without a brain
 2017-04-30 13:24:59 -03:00
Leo
e6026080bb Merge pull request #26694 from QualityVan/brainfixes4 
Fixes seeing the you are a brain! message during monkey transformation
 2017-04-30 13:24:23 -03:00
Leo
be4edbf8c3 Merge pull request #26706 from XDTM/TiredVoice 
Removes Rest from Voice of God
 2017-04-30 13:22:52 -03:00
Leo
2cbb8605a9 Merge pull request #26698 from Cyberboss/patch-68 
Message monitor fix + spawn kill
 2017-04-30 13:22:01 -03:00
Leo
1ef85a20ac Merge pull request #26712 from Cyberboss/patch-63 
Fixes emitter sparks
 2017-04-30 13:21:38 -03:00
kevinz000
f7cf00cf66 Update admin_investigate.dm 2017-04-30 07:55:27 -07:00
ExcessiveUseOfCobblestone
a11e513ee2 1 > TRUE 2017-04-30 03:35:22 -04:00
YakumoChen
e6529d4952 Fixes spelling for Lavaland Syndicate (#26705) 
* Fixes spelling for Lavaland Syndicate

* Update lavaland_ruin_code.dm
 2017-04-30 02:13:15 -05:00
Cheridan
93d3c714f0 Merge pull request #26692 from QualityVan/brainfixes2 
Fixes debraining messages showing up one place they shouldn't
 2017-04-30 02:11:25 -05:00
ExcessiveUseOfCobblestone
7eb24185d9 sneaky... 2017-04-30 01:00:25 -04:00
Cyberboss
bb697a81db Moves config/names to strings/names (#26687) 2017-04-29 21:49:10 -03:00
Robustin
f90b87ae99 The least surprising nerf: Null Crates & Emagged Plasma Export Bonus (#26670) 
* You knew this was coming

* No
 2017-04-29 16:04:55 -06:00