cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 02:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,802 Commits 62 Branches 14 Tags
12f64e463752994de0d7670390f95065bc3c3be3
Commit Graph

10338 Commits

Author SHA1 Message Date
oranges
8ed26b5a20 Merge pull request #38788 from AnturK/borgnamefix 
Fixes borg default name applying
 2018-06-30 11:59:15 +12:00
XDTM
ec58093d7e Stargazers cannot project thoughts while dead (#38775) 2018-06-29 01:54:05 +03:00
AnturK
77a7c500c8 Fixes borg default name scheme 2018-06-28 20:31:21 +02: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
c26c36b184 Merge branch 'pr-38747' 
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
 2018-06-28 14:22:00 -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
AnturK
abfe09659c Fixes borg names. (#38733) 
* Fixes borg names.

* Makes it call the db only once.

* Default cyborg naming scheme.

* Makes cyborgs default to default name instead of random ai one.
 2018-06-28 20:32:14 +03:00
Nich
7db8337ec7 Fixes moth space move (#38736) 2018-06-27 17:08:27 +03:00
AnturK
57028bfa4b Adds missing TIMER_UNIQUE to TIMER_OVERRIDE 2018-06-27 12:54:02 +02:00
Dax Dupont
a89abd5ae8 Remove OOC metadata 2018-06-27 00:30:30 +02:00
zxaber
b27e8738aa [Ready]Expands the list of borg-wearable hats (#38646) 
* Adds the ability to deconstruct empty cyborg shells.

* Update robot_parts.dm

* Update robot.dm

* Update robot.dm

* Update robot.dm

* Update robot_defense.dm

* Update _masks.dm

* Update robot_parts.dm

* Update robot_defense.dm

* replaced type with istype

* Reverting masks.dm

* Removing special snowflake bandana check.

* Update robot_defense.dm

* Added Captain's Crown

By player request.
 2018-06-26 16:54:10 -04:00
ShizCalev
89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
Tad Hardesty
9a5684556a Fix flags_1 overlap and VV, remove CTF deathrattle (#38711) 2018-06-26 16:38:04 -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
Jordan Brown
0f6ecbb92b Merge pull request #38672 from AutomaticFrenzy/patch/goonchat-motd 
Fix the MOTD having too many newlines
 2018-06-25 10:18:20 -04:00
CitrusGender
501fd35cba Fixed cyborgs not getting their names at round start (#38675) 
* fixed cyborgs not getting their names at round start
fixed cyborgs and A.Is being able to get around appearance bans

* Update job.dm

* Update silicon.dm

* goodbye unneeded config otpion

* Update game_options.txt
 2018-06-24 21:55:13 +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
kevinz000
8ae46cf5bf Cyborgs now drop radio keys on detonation/destruction (#38617) 
* Cyborgs now drop radio keys on detonation/destruction

* Woops!

* Update robot.dm

* Use atom rather than turf
 2018-06-23 12:03:36 -07:00
Tad Hardesty
657c2f70f1 Fix the MOTD having too many newlines 2018-06-22 18:19:40 -07:00
Denton
27c3fbea35 hey made in abyss is pretty cool 2018-06-22 16:01:51 +02:00
KorPhaeron
53af80d26a Bubblegum is scarier again (#38306) 
Miners are able to kill him roundstart by just walking backwards while shooting. Weaker than an ash drake.

Easiest way to change this was to give him his original attacks back which required you to avoid/manage blood.
 2018-06-22 11:55:48 +12:00
Tad Hardesty
d4471d8fd9 Fix invalid use of fractional planes 2018-06-21 14:04:51 -07:00
Tad Hardesty
bc72fef8f5 Port AI static to vis_contents 2018-06-21 01:01:32 -07:00
Tad Hardesty
b754e47b09 Tidy up cameranet code slightly 2018-06-20 21:58:58 -07:00
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
Jordan Brown
cf7e8aa9ec Qdels queries, adds sleep safety checks, DBcore checks for leaks (#38363) 
* Qdels all queries, adds sleep handling

* DB Core messages admins about undeleted queries

* Compile fixes. Adds missing set waitfor

* Remove world/New shennanigans. Add DBQuery/BlockingExecute()

* Less spammy notifications to admins about undeleted queries

* Increase dbcore fire time to 1 minute

* Upgrade undeleted query warning

* Better place of death

* Fix build

* Remove BlockingExecute, see BSQL PR for why

* Yep, missed that one.

* Psyche, that's the WRONG QUERY!!
 2018-06-18 22:48:35 +03:00
Jordan Brown
abd415f700 Merge pull request #38553 from AutomaticFrenzy/patch/aghost-saymode 
Allow admin ghosts to use .p and .d say prefixes
 2018-06-18 14:15:54 -04:00
Tad Hardesty
cde78d069a Fix repairing Cyborg headlamp even when its panel is closed (#38550) 2018-06-18 04:03:21 -04:00
Jordan Brown
0a7fb53a3c Merge pull request #38518 from AutomaticFrenzy/patch/uplinks 
Block default interact when opening an unlocked uplink
 2018-06-17 12:13:56 -04:00
Tad Hardesty
169045febe Allow admin ghosts to use .p and .d say prefixes 2018-06-17 03:03:15 -07:00
81Denton
080c681154 Makes the caravan ambush ruin harder to cheese (#38509) 
* makes caravan ambush more challenging

* SMASH
 2018-06-16 13:37:19 -07:00
Tad Hardesty
d1161404db Change nuclear uplinks to not be radios 2018-06-15 19:36:44 -07:00
Tad Hardesty
2f8f166d88 Merge pull request #38287 from ninjanomnom/signal-define 
Use a define to speed up sending signals to datums with no signals
 2018-06-14 22:17:01 -07:00
81Denton
d706e52c5b Reverts #36364 (#38469) 2018-06-14 17:12:08 -04:00
Jordan Brown
9508014bef Merge pull request #38452 from AutomaticFrenzy/patch/examinate 
Fix being able to examine out-of-view turfs
 2018-06-14 15:27:09 -04:00
Tad Hardesty
a211dce412 Fix widescreen turf examine 2018-06-13 18:17:22 -07:00
ninjanomnom
d483ff3ef0 Regexes 
`([^_\.])SendSignal\((.+?)\)` -> `\1SEND_SIGNAL(src, \2)`
`([\.\w]+?)\.SendSignal\((.+?)\)` -> `SEND_SIGNAL(\1, \2)`
 2018-06-13 19:19:23 -04:00
AnturK
fd6851ef8d Fixes drunken scientist R&D point gain. (#38432) 
* Fixes drunken scientist point gain.

* Only R&D points

* Didn't mean to add this newline here.
 2018-06-13 05:26:34 -04:00
Dax Dupont
4e3eff4f73 Equalizes thresholds on being fat (#38383) 2018-06-13 03:56:24 -04:00
Armhulen
82c2bffe9d Adds a new drink: Peppermint Patty from Archer! (#38427) 
* Sprites!

*  S_______ W________

* Candyland snuck into pr... Check!

* removal of candyland extract

* candyland but not the sprites yet.

* fixes :)

* Whoops, lets fix that too
 2018-06-13 03:49:44 -04:00
XDTM
a1037d1039 Androids are immune to radiation (#38420) 2018-06-13 00:17:27 -07:00
Tad Hardesty
abbc32e0a1 Fix being able to examine out-of-view turfs 2018-06-13 00:06:20 -07:00
Jordan Brown
9089af581d Merge pull request #38414 from XDTM/cold_never_bothered_me_anyway 
RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself
 2018-06-12 18:16:53 -04:00
oranges
fb6a61b5cb Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-12 11:48:21 +12:00
oranges
5a079bae42 Merge pull request #38378 from AutomaticFrenzy/patch/deaf-borg-mods 
Fix deaf people hearing borg modules going offline
 2018-06-12 11:45:56 +12:00
Jordan Brown
88cad42812 Merge pull request #38381 from AutomaticFrenzy/patch/orb-of-confusion 
Fix legion cores not healing confusion
 2018-06-11 16:51:02 -04:00
XDTM
fa6c0dd393 chill 2018-06-11 14:42:06 +02:00
XDTM
9cde3a65c6 RESISTCOLD trait now properly prevents damage and slowdown 2018-06-11 14:38:26 +02:00
ShizCalev
753752180c Makes swimsuits underwear (#38372) 2018-06-10 22:13:51 -07:00