cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,024 Commits 61 Branches 14 Tags
c2218f9dd76bcf4285ffd22d4f2b341b1bdd19dd
Commit Graph

28643 Commits

Author SHA1 Message Date
Remie Richards
c2218f9dd7 break -> continue 2016-06-21 01:22:13 +01:00
Remie Richards
3eed211d91 Venus human trap changes 
* Venus human traps now obey the laws of physics when it comes to finding targets
* Venus human traps will continue to grab hold of you even if you're through a wall SO LONG AS YOU WERE ORIGINALLY A VALID TARGET (headcannon: it can still feel you and grasp hold of you with it's vine)
 2016-06-21 01:18:53 +01:00
oranges
944ab8588b Merge pull request #18764 from coiax/fix-18748 
Fixes flags, and reorders them
 2016-06-21 10:21:42 +12:00
oranges
a62066ebe4 Merge pull request #18727 from RemieRichards/global_procs_in_addtimer 
You can now call global procs with addtimer()
 2016-06-21 10:18:49 +12:00
Cheridan
4dd56dfbb7 Merge pull request #18738 from pudl/ka-desc 
Improves the KA description
 2016-06-20 17:12:42 -05:00
Remie Richards
b0634d3227 istext() check on procToCall 2016-06-20 23:06:51 +01:00
oranges
46bbb4b615 Merge pull request #18728 from coiax/spawn-removal-2 
Removes spawn() from some more slime reactions
 2016-06-21 09:57:07 +12:00
oranges
6ddd748fb2 Merge pull request #18726 from coiax/spawn-removal-1 
Removes spawn() from things I
 2016-06-21 09:56:38 +12:00
oranges
e2718408df Merge pull request #18720 from Supermichael777/Flaps-fix 
Makes beapsky able to use his room and all bots be able to use flaps
 2016-06-21 09:35:15 +12:00
Joan Lung
f3043b3386 Cogscarabs have the proper dead icon (#18759) 
* Cogscarabs have the proper dead icon

* replace deconflict
 2016-06-20 15:55:36 -05:00
Xhuis
3e890997f9 Welding fuel hotfix (#18773) 2016-06-20 14:05:11 -05:00
Joan Lung
74945ba314 Slightly important bugfix (#18747) 2016-06-20 12:39:18 -05:00
Cheridan
e4b73d3aae Merge pull request #18739 from ChangelingRain/camocost 
Nuke ops can no longer get free noslips with their camo kit
 2016-06-20 11:37:51 -05:00
Jack Edge
b9af701379 Fixes flags, and reorders them 
Please, let's not have this happen again.
Fixes #18748.
 2016-06-20 17:19:55 +01:00
Joan Lung
7f671620bf Merge pull request #18758 from pudl/i-dedicate-i-dedicate 
Cleaned up the big mess I made
 2016-06-20 11:26:19 -04:00
Joan Lung
6190940d96 Anima Fragments and Clockwork Marauders glow faintly (#18736) 
* Anima Fragments and Clockwork Marauders glow faintly

* I'm not fucking with that
 2016-06-20 17:10:08 +02:00
Supermichael777
f35a410ab6 Stupid github didnt show your coment the first time 2016-06-20 09:16:47 -04:00
pudl
3406c5ec30 removal 2016-06-20 07:35:33 -05:00
pudl
8ab329341e yay 2016-06-20 07:32:58 -05:00
pudl
f459865be7 Improvements 2016-06-20 05:51:40 -05:00
Kyle Spier-Swenson
0d6bbbb412 stop the pills (#18703) 
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
 2016-06-20 12:07:44 +02:00
oranges
c480ad71ee Merge pull request #18732 from MrStonedOne/patch-218 
sstimer: Does a thing in a less retarded way.
 2016-06-20 18:48:05 +12:00
Xhuis
c81d5fc354 Clockwork cult antagonist creation and job bans (#18730) 
* Clock cult creation and jobbans

* Admin creation objective description failsafe

* Failsafe, for real this time
 2016-06-20 08:27:57 +02:00
oranges
b43afb8209 Merge pull request #18721 from KorPhaeron/yellingatotherservers 
Allows basil and sybil captains to yell at eachother
 2016-06-20 11:41:43 +12:00
KorPhaeron
85cda49eba Multiline input 2016-06-19 18:32:42 -05:00
KorPhaeron
c46f2624aa Station name instead of world.name 2016-06-19 18:25:55 -05:00
oranges
bce99c4f58 Merge pull request #18668 from coiax/dropdel 
Adds DROPDEL flag; items will qdel() on dropped()
 2016-06-20 11:08:31 +12:00
oranges
9f2cfa39d3 Merge pull request #18597 from pudl/detective-office 
[MAP] Moves the detective to above the post office
 2016-06-20 11:03:24 +12:00
oranges
72371fcdc7 Merge pull request #18693 from Core0verload/list_overhead 
Reduces list init overhead a tiny bit
 2016-06-20 10:59:48 +12:00
oranges
23a792213a Merge pull request #18632 from Cheridan/hardcounter 
Changes flashes vs. borgs
 2016-06-20 10:57:34 +12:00
Supermichael777
f6dd9cc402 Actualy fixes the bug because OBTUSE PROC NAMES. 2016-06-19 18:53:44 -04:00
oranges
54634d780a Merge pull request #18713 from Xhuis/mfw_someones_already_doing_underwater_station 
Adds win/loss tracking to clockwork cult
 2016-06-20 10:49:20 +12:00
oranges
9d2d092847 Merge pull request #18658 from coiax/fix-18389 
Bar tables now shuttle rotate properly
 2016-06-20 08:18:48 +12:00
oranges
448e386ac4 Merge pull request #18649 from Xhuis/my_eyes_have_seen_that_which_cannot_be_comprehended 
Reagent tank optimization
 2016-06-20 08:18:33 +12:00
oranges
7dc92e3f98 Merge pull request #18647 from TechnoAlchemisto/I_was_lucky_if_papa_went_for_me_first_because_then_at_least_I_would_be_too_disoriented_to_realize_what_he_was_doing_to_sis 
Adds hard cider to the bar.
 2016-06-20 08:18:05 +12:00
oranges
679d9644d3 Merge pull request #18631 from KorPhaeron/ruins_cult 
Cult can only use runes on station and on mining
 2016-06-20 08:17:38 +12:00
oranges
42abed6467 Merge pull request #18635 from timkoster1/Devil-Hunger 
Gives devil saturation on receiving a soul
 2016-06-20 08:16:06 +12:00
oranges
d6bdeb7124 Merge pull request #18455 from Incoming5643/no_bones_about_it 
Mutantrace specflag omnibus
 2016-06-20 08:15:34 +12:00
Joan Lung
20860f2d6a Merge pull request #18646 from Cruix/languages_split 
Splits languages into languages_spoken and languages_understood.
 2016-06-19 15:23:38 -04:00
unknown
f052ce679b Fixed compile error 2016-06-19 15:13:16 -04:00
unknown
4b396a52e7 Resolved conflicts 2016-06-19 15:07:36 -04:00
coiax
961a6c4c26 Adds potted plants to cargo packs (#18662) 
🆑 coiax
rscadd: Potted plants can now be ordered from cargo.
/🆑
 2016-06-19 14:05:18 -05:00
Cheridan
944b695ec3 Merge pull request #18660 from coiax/fix-17560 
All living mobs can now attempt to pick up cards
 2016-06-19 13:37:59 -05:00
Joan Lung
5019342bf1 Clockwork power drain will update APCs (#18707) 2016-06-19 13:35:11 -05:00
Joan Lung
28fe7a29aa Invoking Nzcrentr causes slightly more damage (#18705) 2016-06-19 13:34:19 -05:00
Cheridan
ef78429058 Merge pull request #18694 from ChangelingRain/lesscomponents 
Slows down clockwork component generation slightly
 2016-06-19 13:32:58 -05:00
Cheridan
2464e3a664 Merge pull request #18692 from ChangelingRain/fastcastblast 
If Ratvar is alive or the slab has no cost, invoke time is halved
 2016-06-19 13:04:02 -05:00
Cheridan
3cd3d9d476 Merge pull request #18715 from xxalpha/ifixallthefloors 
Repathed z5.dmm's asteroid platings, added warning floors, clean up.
 2016-06-19 12:52:51 -05:00
Cheridan
06d8cf8491 Merge pull request #18718 from AnturK/buncha_fixes 
Minor fixes
 2016-06-19 12:31:58 -05:00
Joan Lung
05d915b0bb Tweaks clockwork structure health (#18696) 2016-06-19 18:12:17 +02:00